From aa89487fd0cd72857cf95fd5fdd66833ba960b55 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Sun, 6 Nov 2005 23:32:22 +0000 Subject: [PATCH] Fixed ReST bug in [1110] git-svn-id: http://code.djangoproject.com/svn/django/trunk@1111 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/templates.txt | 68 +++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/docs/templates.txt b/docs/templates.txt index 2e681f384e..0ac8e0172b 100644 --- a/docs/templates.txt +++ b/docs/templates.txt @@ -509,64 +509,64 @@ with some custom extensions. Available format strings: -================ ====================================== ===================== -Format character Description Example output -================ ====================================== ===================== -a ``'a.m.'`` or ``'p.m.'`` (Note that ``'a.m.'`` +================ ======================================== ===================== +Format character Description Example output +================ ======================================== ===================== +a ``'a.m.'`` or ``'p.m.'`` (Note that ``'a.m.'`` this is slightly different than PHP's output, because this includes periods to match Associated Press style.) -A ``'AM'`` or ``'PM'``. ``'AM'`` +A ``'AM'`` or ``'PM'``. ``'AM'`` B Not implemented. -d Day of the month, 2 digits with ``'01'`` to ``'31'`` +d Day of the month, 2 digits with ``'01'`` to ``'31'`` leading zeros. -D Day of the week, textual, 3 letters. ``'Fri'`` -f Time, in 12-hour hours and minutes, ``'1'``, ``'1:30'`` +D Day of the week, textual, 3 letters. ``'Fri'`` +f Time, in 12-hour hours and minutes, ``'1'``, ``'1:30'`` with minutes left off if they're zero. Proprietary extension. -F Month, textual, long. ``'January'`` -g Hour, 12-hour format without leading ``'1'`` to ``'12'`` +F Month, textual, long. ``'January'`` +g Hour, 12-hour format without leading ``'1'`` to ``'12'`` zeros. -G Hour, 24-hour format without leading ``'0'`` to ``'23'`` +G Hour, 24-hour format without leading ``'0'`` to ``'23'`` zeros. -h Hour, 12-hour format. ``'01'`` to ``'12'`` -H Hour, 24-hour format. ``'00'`` to ``'23'`` -i Minutes. ``'00'`` to ``'59'`` +h Hour, 12-hour format. ``'01'`` to ``'12'`` +H Hour, 24-hour format. ``'00'`` to ``'23'`` +i Minutes. ``'00'`` to ``'59'`` I Not implemented. -j Day of the month without leading ``'1'`` to ``'31'`` +j Day of the month without leading ``'1'`` to ``'31'`` zeros. -l Day of the week, textual, long. ``'Friday'`` -L Boolean for whether it's a leap year. ``True`` or ``False`` -m Month, 2 digits with leading zeros. ``'01'`` to ``'12'`` -M Month, textual, 3 letters. ``'Jan'`` -n Month without leading zeros. ``'1'`` to ``'12'`` -N Month abbreviation in Associated Press ``'Jan.'``, ``'Feb.'``, ``'March'``, ``'May'`` +l Day of the week, textual, long. ``'Friday'`` +L Boolean for whether it's a leap year. ``True`` or ``False`` +m Month, 2 digits with leading zeros. ``'01'`` to ``'12'`` +M Month, textual, 3 letters. ``'Jan'`` +n Month without leading zeros. ``'1'`` to ``'12'`` +N Month abbreviation in Associated Press ``'Jan.'``, ``'Feb.'``, ``'March'``, ``'May'`` style. Proprietary extension. -O Difference to Greenwich time in hours. ``'+0200'`` -P Time, in 12-hour hours, minutes and ``'1 a.m.'``, ``'1:30 p.m.'``, ``'midnight'``, ``'noon'``, ``'12:30 p.m.'`` +O Difference to Greenwich time in hours. ``'+0200'`` +P Time, in 12-hour hours, minutes and ``'1 a.m.'``, ``'1:30 p.m.'``, ``'midnight'``, ``'noon'``, ``'12:30 p.m.'`` 'a.m.'/'p.m.', with minutes left off if they're zero and the special-case strings 'midnight' and 'noon' if appropriate. Proprietary extension. -r RFC 822 formatted date. ``'Thu, 21 Dec 2000 16:01:07 +0200'`` -s Seconds, 2 digits with leading zeros. ``'00'`` to ``'59'`` -S English ordinal suffix for day of the ``'st'``, ``'nd'``, ``'rd'`` or ``'th'`` +r RFC 822 formatted date. ``'Thu, 21 Dec 2000 16:01:07 +0200'`` +s Seconds, 2 digits with leading zeros. ``'00'`` to ``'59'`` +S English ordinal suffix for day of the ``'st'``, ``'nd'``, ``'rd'`` or ``'th'`` month, 2 characters. t Not implemented. -T Time zone of this machine. ``'EST'``, ``'MDT'`` +T Time zone of this machine. ``'EST'``, ``'MDT'`` U Not implemented. -w Day of the week, digits without ``'0'`` (Sunday) to ``'6'`` (Saturday) +w Day of the week, digits without ``'0'`` (Sunday) to ``'6'`` (Saturday) leading zeros. -W ISO-8601 week number of year, with ``1``, ``23`` +W ISO-8601 week number of year, with ``1``, ``23`` weeks starting on Monday. -y Year, 2 digits. ``'99'`` -Y Year, 4 digits. ``'1999'`` -z Day of the year. ``0`` to ``365`` -Z Time zone offset in seconds. The ``-43200`` to ``43200`` +y Year, 2 digits. ``'99'`` +Y Year, 4 digits. ``'1999'`` +z Day of the year. ``0`` to ``365`` +Z Time zone offset in seconds. The ``-43200`` to ``43200`` offset for timezones west of UTC is always negative, and for those east of UTC is always positive. -================ ====================================== ===================== +================ ======================================== ===================== Example::