diff options
| author | inondle <qfulsher@gmail.com> | 2016-02-26 13:44:22 -0800 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-02-27 08:07:39 -0500 |
| commit | e96cdc6f99923621f543751d4cc0fddef1514422 (patch) | |
| tree | c28d3b4ac0fcf78f08e57fe669eb69bd264d9fd9 | |
| parent | ba6f83ec95dbd265ae3d493c8d6375f36052d12e (diff) | |
[1.9.x] Fixed #26275 -- Noted difference between o and Y date format chars.
Backport of 5fb9756eba01237cc0e550da689b9b79c51c96ed from master
| -rw-r--r-- | docs/ref/templates/builtins.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt index ad8fadfb7d..e67dc637c3 100644 --- a/docs/ref/templates/builtins.txt +++ b/docs/ref/templates/builtins.txt @@ -1349,8 +1349,9 @@ n Month without leading zeros. ``'1'`` to ``'12'`` N Month abbreviation in Associated Press ``'Jan.'``, ``'Feb.'``, ``'March'``, ``'May'`` style. Proprietary extension. o ISO-8601 week-numbering year, ``'1999'`` - corresponding to - the ISO-8601 week number (W) + corresponding to the ISO-8601 week + number (W) which uses leap weeks. See Y + for the more common year format. 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 |