summaryrefslogtreecommitdiffstats
path: root/user_guide_src
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-02-29 14:06:03 +0100
committerAndrey Andreev <narf@bofh.bg>2012-02-29 14:06:03 +0100
commit172331d40c991741c76fcf70f4262c2db821c6f8 (patch)
tree6704d91daf1fc998171b3c33023a85118f9ad2fd /user_guide_src
parent4a64a223da13a8fb1bf2720f068e55a7967a4486 (diff)
parentb692ccb2414928913ebd713a094fc3150db07495 (diff)
Merge upstream/branch
Diffstat (limited to 'user_guide_src')
-rw-r--r--user_guide_src/source/changelog.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 35e876766..1b4b13f27 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -38,8 +38,9 @@ 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.
+ - Changed humanize to include a second param for the separator.
- 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).
- Added date_range() to the :doc:`Date Helper <helpers/html_helper>`.
- Database