diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
a
|
b
|
|
723 | 723 | |
724 | 724 | This would display as "It is the 4th of September". |
725 | 725 | |
| 726 | .. versionadded:: 1.2 |
| 727 | |
| 728 | The ``c`` and ``u`` format specification characters were added in Django 1.2. |
| 729 | |
726 | 730 | .. templatetag:: regroup |
727 | 731 | |
728 | 732 | regroup |
… |
… |
|
1132 | 1136 | |
1133 | 1137 | Given format can be one of the predefined ones ``DATE_FORMAT``, |
1134 | 1138 | ``DATETIME_FORMAT``, ``SHORT_DATE_FORMAT`` or ``SHORT_DATETIME_FORMAT``, |
1135 | | or a custom format, same as the `now`_ tag. Note that predefined formats may |
1136 | | vary depending on the current locale. |
| 1139 | or a custom format, same as the :ttag:`now` tag. Note that predefined formats |
| 1140 | may vary depending on the current locale. |
1137 | 1141 | |
1138 | 1142 | For example:: |
1139 | 1143 | |
… |
… |
|
1780 | 1784 | Formats a time according to the given format. |
1781 | 1785 | |
1782 | 1786 | Given format can be the predefined one ``TIME_FORMAT``, or a custom format, |
1783 | | same as the `now`_ tag. Note that the predefined format is locale depending. |
| 1787 | same as the :ttag:`now` tag. Note that the predefined format is locale- |
| 1788 | dependant. |
1784 | 1789 | |
1785 | 1790 | The time filter will only accept parameters in the format string that relate |
1786 | 1791 | to the time of day, not the date (for obvious reasons). If you need to |
1787 | | format a date, use the `date`_ filter. |
| 1792 | format a date, use the :tfilter:`date` filter. |
1788 | 1793 | |
1789 | 1794 | For example:: |
1790 | 1795 | |
diff --git a/docs/releases/1.2.txt b/docs/releases/1.2.txt
a
|
b
|
|
235 | 235 | If your ``get_db_prep_*()`` methods made no use of the database |
236 | 236 | connection, you should be able to upgrade by renaming |
237 | 237 | ``get_db_prep_value()`` to ``get_prep_value()`` and |
238 | | ``get_db_prep_lookup()`` to ``get_prep_lookup()`. If you require |
| 238 | ``get_db_prep_lookup()`` to ``get_prep_lookup()``. If you require |
239 | 239 | database specific conversions, then you will need to provide an |
240 | 240 | implementation ``get_db_prep_*`` that uses the ``connection`` |
241 | 241 | argument to resolve database-specific values. |
… |
… |
|
997 | 997 | inline objects in the admin now allows inline objects to be |
998 | 998 | dynamically added and removed. Users without JavaScript-enabled |
999 | 999 | browsers will see no change in the behavior of inline objects. |
| 1000 | |
| 1001 | New ``now`` template tag format specifier characters: ``c`` and ``u`` |
| 1002 | --------------------------------------------------------------------- |
| 1003 | |
| 1004 | The argument to the :ttag:`now` has gained two new format characters: ``c`` to |
| 1005 | specify that a date+time value should be output in ISO 8601 format, and ``u`` |
| 1006 | that allows output of the microseconds part of a date+time or time value. |
| 1007 | |
| 1008 | These are also available in others parts like the :tfilter:`date` and |
| 1009 | :tfilter:`time` template filters, the ``humanize`` template tag library and the |
| 1010 | new `format localization`_ framework. |
| 1011 | |
| 1012 | .. _format localization: `Improved localization`_ |