svn: /phpdoc/en/trunk/reference/datetime/functions/ strftime.xml
| From: | Adam Harvey | Date: | Mon, 03 Dec 2012 01:57:57 +0000 |
| Subject: | svn: /phpdoc/en/trunk/reference/datetime/functions/ strftime.xml | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-10824@lists.php.net to get a copy of this message | ||
aharvey Mon, 03 Dec 2012 01:57:57 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=328617
Log:
Update the documentation for the %z and %Z strftime() modifiers to reflect how
C99 specifies them, and describe how Windows misinteprets them.
Also add a <literal /> to the Solaris warning, since there was one missing and
I was already in there.
Fixes doc bug #63662 (Strftime documentation for %z & %Z is not (necessarily?)
correct.).
Bug: https://bugs.php.net/63662 (Assigned) Strftime
documentation for %z & %Z is not (necessarily?) correct.
Changed paths:
U phpdoc/en/trunk/reference/datetime/functions/strftime.xml
Modified: phpdoc/en/trunk/reference/datetime/functions/strftime.xml
===================================================================
--- phpdoc/en/trunk/reference/datetime/functions/strftime.xml 2012-12-03 01:12:01 UTC (rev 328616)
+++ phpdoc/en/trunk/reference/datetime/functions/strftime.xml 2012-12-03 01:57:57 UTC (rev 328617)
@@ -243,15 +243,15 @@
</row>
<row>
<entry><literal>%z</literal></entry>
- <entry>Either the time zone offset from UTC or the abbreviation (depends
- on operating system)</entry>
- <entry>Example: <literal>-0500</literal> or
<literal>EST</literal> for Eastern Time</entry>
+ <entry>The time zone offset. Not implemented as described on
+ Windows. See below for more information.</entry>
+ <entry>Example: <literal>-0500</literal> for US Eastern
Time</entry>
</row>
<row>
<entry><literal>%Z</literal></entry>
- <entry>The time zone offset/abbreviation option NOT given by %z (depends
- on operating system)</entry>
- <entry>Example: <literal>-0500</literal> or
<literal>EST</literal> for Eastern Time</entry>
+ <entry>The time zone abbreviation. Not implemented as described on
+ Windows. See below for more information.</entry>
+ <entry>Example: <literal>EST</literal> for Eastern Time</entry>
</row>
<row>
<entry align="center"><emphasis>Time and Date
Stamps</emphasis></entry>
@@ -314,17 +314,25 @@
</para>
<warning>
<simpara>
- Contrary to ISO-9899:1999, Sun Solaris starts with Sunday as 1.
- As a result, %u may not function as described in this manual.
+ Contrary to ISO-9899:1999, Sun Solaris starts with Sunday as 1. As a
+ result, <literal>%u</literal> may not function as described in this
+ manual.
</simpara>
</warning>
<warning>
- <simpara>
- <emphasis>Windows only:</emphasis> The <literal>%e</literal>
modifier
- is not supported in the Windows implementation of this function. To achieve
- this value, the <literal>%#d</literal> modifier can be used instead. The
- example below illustrates how to write a cross platform compatible function.
- </simpara>
+ <para>
+ <emphasis>Windows only:</emphasis>
+ </para>
+ <para>
+ The <literal>%e</literal> modifier is not supported in the Windows
+ implementation of this function. To achieve this value, the
+ <literal>%#d</literal> modifier can be used instead. The example below
+ illustrates how to write a cross platform compatible function.
+ </para>
+ <para>
+ The <literal>%z</literal> and <literal>%Z</literal> modifiers both
+ return the time zone name instead of the offset or abbreviation.
+ </para>
</warning>
<warning>
<simpara>