From 0f5e2da1608fc1d991f1925392dcdb62c6f6aedd Mon Sep 17 00:00:00 2001 From: Rical Jasan Date: Mon, 22 Jan 2018 19:24:24 -0800 Subject: manual: Touch up documentation for strftime and ALTMON_* constants. "%OB" is considered a conversion specifier ("B" is the format specifier), and the list of format specifiers for months in the description of the optional "O" modifier was incomplete. A cross-reference from the ALTMON_* constants to the strftime section is also provided. Lastly, some grammatical fixes (commas) are made and paragraphs refactored (rewrapped). * manual/locale.texi (ALTMON_1, ALTMON_2, ALTMON_3, ALTMON_4, ALTMON_5, ALTMON_6, ALTMON_7, ALTMON_8, ALTMON_9, ALTMON_10, ALTMON_11, ALTMON_12): Improve documentation. * manual/time.texi (strftime): Likewise. --- ChangeLog | 7 +++++++ manual/locale.texi | 25 ++++++++++++++++--------- manual/time.texi | 8 ++++---- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b518b269a..c09316d57e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2018-01-22 Rical Jasan + + * manual/locale.texi (ALTMON_1, ALTMON_2, ALTMON_3, ALTMON_4) + (ALTMON_5, ALTMON_6, ALTMON_7, ALTMON_8, ALTMON_9, ALTMON_10) + (ALTMON_11, ALTMON_12): Improve documentation. + * manual/time.texi (strftime): Likewise. + 2018-01-22 Rafal Luzynski [BZ #10871] diff --git a/manual/locale.texi b/manual/locale.texi index 059db75c1c..dabb959f9e 100644 --- a/manual/locale.texi +++ b/manual/locale.texi @@ -923,7 +923,7 @@ corresponds to Sunday. @itemx DAY_5 @itemx DAY_6 @itemx DAY_7 -Similar to @code{ABDAY_1} etc.,@: but here the return value is the +Similar to @code{ABDAY_1}, etc.,@: but here the return value is the unabbreviated weekday name. @item ABMON_1 @itemx ABMON_2 @@ -937,9 +937,9 @@ unabbreviated weekday name. @itemx ABMON_10 @itemx ABMON_11 @itemx ABMON_12 -The return value is the abbreviated name of the month, in the grammatical -form used when the month forms part of a complete date. @code{ABMON_1} -corresponds to January. +The return value is the abbreviated name of the month, in the +grammatical form used when the month forms part of a complete date. +@code{ABMON_1} corresponds to January. @item MON_1 @itemx MON_2 @itemx MON_3 @@ -952,8 +952,9 @@ corresponds to January. @itemx MON_10 @itemx MON_11 @itemx MON_12 -Similar to @code{ABMON_1} etc.,@: but here the month names are not abbreviated. -Here the first value @code{MON_1} also corresponds to January. +Similar to @code{ABMON_1}, etc.,@: but here the month names are not +abbreviated. Here the first value @code{MON_1} also corresponds to +January. @item ALTMON_1 @itemx ALTMON_2 @itemx ALTMON_3 @@ -966,13 +967,19 @@ Here the first value @code{MON_1} also corresponds to January. @itemx ALTMON_10 @itemx ALTMON_11 @itemx ALTMON_12 -Similar to @code{MON_1} etc.,@: but here the month names are in the grammatical -form used when the month is named by itself. The @code{strftime} functions -use these month names for the format specifier @code{OB}. +Similar to @code{MON_1}, etc.,@: but here the month names are in the +grammatical form used when the month is named by itself. The +@code{strftime} functions use these month names for the conversion +specifier @code{%OB} (@pxref{Formatting Calendar Time}). Note that not all languages need two different forms of the month names, so the strings returned for @code{MON_@dots{}} and @code{ALTMON_@dots{}} may or may not be the same, depending on the locale. + +@strong{NB:} @code{ABALTMON_@dots{}} constants corresponding to the +@code{%Ob} conversion specifier are not currently provided, but are +expected to be in a future release. In the meantime, it is possible +to use @code{_NL_ABALTMON_@dots{}}. @item AM_STR @itemx PM_STR The return values are strings which can be used in the representation of time diff --git a/manual/time.texi b/manual/time.texi index 2a5afd9e56..4d154452eb 100644 --- a/manual/time.texi +++ b/manual/time.texi @@ -1349,10 +1349,10 @@ Emperors' reigns. With all format specifiers that produce numbers: use the locale's alternate numeric symbols. -With @code{%B} and @code{%b}: use the grammatical form for month names -that is appropriate when the month is named by itself, rather than -the form that is appropriate when the month is used as part of a -complete date. This is a GNU extension. +With @code{%B}, @code{%b}, and @code{%h}: use the grammatical form for +month names that is appropriate when the month is named by itself, +rather than the form that is appropriate when the month is used as +part of a complete date. This is a GNU extension. @end table If the format supports the modifier but no alternate representation -- cgit v1.2.1