Hi Michael, On Sun, Jan 10, 2010 at 12:45 PM, Michael Witten <mfwitten@xxxxxxxxx> wrote: > Signed-off-by: Michael Witten <mfwitten@xxxxxxxxx> > --- > man3/strftime.3 | 19 ++++++++++++------- > 1 files changed, 12 insertions(+), 7 deletions(-) Thanks! Applied for 3.24. Cheers, Michael > diff --git a/man3/strftime.3 b/man3/strftime.3 > index bafe841..38f3afb 100644 > --- a/man3/strftime.3 > +++ b/man3/strftime.3 > @@ -51,13 +51,18 @@ result in the character array \fIs\fP of size \fImax\fP. > .\" FIXME POSIX says: Local timezone information is used as though > .\" strftime() called tzset(). But this doesn't appear to be the case > .PP > -Ordinary characters placed in the format string are copied to \fIs\fP > -without conversion. > -.I "Conversion specifications" > -are introduced by a \(aq%\(aq > -character, and terminated by a > -.IR "conversion specifier character" , > -and are replaced in \fIs\fP as follows: > +The format specification is a null-terminated string and may contain > +special character sequences called > +.IR "conversion specifications", > +each of which is introduced by a \(aq%\(aq character and terminated by > +some other character known as a > +.IR "conversion specifier character". > +All other character sequences are > +.IR "ordinary character sequences". > +.PP > +The characters of ordinary character sequences (including the null byte) > +are copied verbatim from \fIformat\fP to \fIs\fP. However, the characters > +of conversion specifications are replaced as follows: > .TP > .B %a > The abbreviated weekday name according to the current locale. > -- > 1.6.6.102.gd6f8f > > -- Michael Kerrisk Linux man-pages maintainer; http://www.kernel.org/doc/man-pages/ Author of "The Linux Programming Interface" http://blog.man7.org/ -- To unsubscribe from this list: send the line "unsubscribe linux-man" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
