summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-02-29 15:44:11 +0100
committerAndrey Andreev <narf@bofh.bg>2012-02-29 15:44:11 +0100
commit41c739452fb898e5a0f986f2d568b265955d1538 (patch)
tree544256b93093fe5e0fb468c39d46846245c362e0 /user_guide_src/source
parent78b24bfdaaea0f208802f36730c032e7ec98eb56 (diff)
parenta5a2cfef881f4cb70729b854e2e86932f28c43f6 (diff)
Merge remote-tracking branch 'upstream/develop' into develop-db-odbc
Diffstat (limited to 'user_guide_src/source')
-rw-r--r--user_guide_src/source/changelog.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 6e596e5ab..890097039 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -28,6 +28,7 @@ Release Date: Not Released
- Added support for 3gp, 3g2, mp4, wmv, f4v, vlc Video files to mimes.php.
- Added support for m4a, aac, m4u, xspf, au, ac3, flac, ogg Audio files to mimes.php.
- Added support for kmz and kml (Google Earth) files to mimes.php.
+ - Updated support for doc files in mimes.php.
- Added application/xml for xml and application/xml, text/xsl for xsl in mimes.php.
- Changed logger to only chmod when file is first created.
- Removed previously deprecated SHA1 Library.
@@ -39,8 +40,8 @@ Release Date: Not Released
- url_title() will now trim extra dashes from beginning and end.
- Added XHTML Basic 1.1 doctype to :doc:`HTML Helper <helpers/html_helper>`.
- Changed humanize to include a second param for the separator.
- - Refactored ``plural()`` and ``singular()`` to avoid double pluralization and
-support more words.
+ - Refactored ``plural()`` and ``singular()`` to avoid double pluralization and support more words.
+ - Added an optional third parameter to ``force_download()`` that enables/disables sending the actual file MIME type in the Content-Type header (disabled by default).
- Database