philip Mon Apr 11 13:34:45 2005 EDT
Modified files: /phpdoc/en/reference/datetime/functions date.xml Log: recategorized (grouped) the character table as per a user comment, added category titles maybe one day we can add colors to our tables/headings/titles user comment: val at valcohen dot com
http://cvs.php.net/diff.php/phpdoc/en/reference/datetime/functions/date.xml?r1=1.16&r2=1.17&ty=u Index: phpdoc/en/reference/datetime/functions/date.xml diff -u phpdoc/en/reference/datetime/functions/date.xml:1.16 phpdoc/en/reference/datetime/functions/date.xml:1.17 --- phpdoc/en/reference/datetime/functions/date.xml:1.16 Sat Jan 1 15:58:50 2005 +++ phpdoc/en/reference/datetime/functions/date.xml Mon Apr 11 13:34:42 2005 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.16 $ --> +<!-- $Revision: 1.17 $ --> <!-- splitted from ./en/functions/datetime.xml, last change in rev 1.2 --> <refentry id="function.date"> <refnamediv> @@ -53,24 +53,9 @@ </thead> <tbody> <row> - <entry><literal>a</literal></entry> - <entry>Lowercase Ante meridiem and Post meridiem</entry> - <entry><literal>am</literal> or <literal>pm</literal></entry> - </row> - <row> - <entry><literal>A</literal></entry> - <entry>Uppercase Ante meridiem and Post meridiem</entry> - <entry><literal>AM</literal> or <literal>PM</literal></entry> - </row> - <row> - <entry><literal>B</literal></entry> - <entry>Swatch Internet time</entry> - <entry><literal>000</literal> through <literal>999</literal></entry> - </row> - <row> - <entry><literal>c</literal></entry> - <entry>ISO 8601 date (added in PHP 5)</entry> - <entry>2004-02-12T15:19:21+00:00</entry> + <entry align="center"><emphasis>Day</emphasis></entry> + <entry>---</entry> + <entry>---</entry> </row> <row> <entry><literal>d</literal></entry> @@ -83,54 +68,52 @@ <entry><literal>Mon</literal> through <literal>Sun</literal></entry> </row> <row> - <entry><literal>F</literal></entry> - <entry>A full textual representation of a month, such as January or March</entry> - <entry><literal>January</literal> through <literal>December</literal></entry> - </row> - <row> - <entry><literal>g</literal></entry> - <entry>12-hour format of an hour without leading zeros</entry> - <entry><literal>1</literal> through <literal>12</literal></entry> + <entry><literal>j</literal></entry> + <entry>Day of the month without leading zeros</entry> + <entry><literal>1</literal> to <literal>31</literal></entry> </row> <row> - <entry><literal>G</literal></entry> - <entry>24-hour format of an hour without leading zeros</entry> - <entry><literal>0</literal> through <literal>23</literal></entry> + <entry><literal>l</literal> (lowercase 'L')</entry> + <entry>A full textual representation of the day of the week</entry> + <entry><literal>Sunday</literal> through <literal>Saturday</literal></entry> </row> <row> - <entry><literal>h</literal></entry> - <entry>12-hour format of an hour with leading zeros</entry> - <entry><literal>01</literal> through <literal>12</literal></entry> + <entry><literal>S</literal></entry> + <entry>English ordinal suffix for the day of the month, 2 characters</entry> + <entry> + <literal>st</literal>, <literal>nd</literal>, <literal>rd</literal> or + <literal>th</literal>. Works well with <literal>j</literal> + </entry> </row> <row> - <entry><literal>H</literal></entry> - <entry>24-hour format of an hour with leading zeros</entry> - <entry><literal>00</literal> through <literal>23</literal></entry> + <entry><literal>w</literal></entry> + <entry>Numeric representation of the day of the week</entry> + <entry><literal>0</literal> (for Sunday) through <literal>6</literal> (for Saturday)</entry> </row> <row> - <entry><literal>i</literal></entry> - <entry>Minutes with leading zeros</entry> - <entry><literal>00</literal> to <literal>59</literal></entry> + <entry><literal>z</literal></entry> + <entry>The day of the year (starting from 0)</entry> + <entry><literal>0</literal> through <literal>365</literal></entry> </row> <row> - <entry><literal>I</literal> (capital i)</entry> - <entry>Whether or not the date is in daylights savings time</entry> - <entry><literal>1</literal> if Daylight Savings Time, <literal>0</literal> otherwise.</entry> + <entry align="center"><emphasis>Week</emphasis></entry> + <entry>---</entry> + <entry>---</entry> </row> <row> - <entry><literal>j</literal></entry> - <entry>Day of the month without leading zeros</entry> - <entry><literal>1</literal> to <literal>31</literal></entry> + <entry><literal>W</literal></entry> + <entry>ISO-8601 week number of year, weeks starting on Monday (added in PHP 4.1.0)</entry> + <entry>Example: <literal>42</literal> (the 42nd week in the year)</entry> </row> <row> - <entry><literal>l</literal> (lowercase 'L')</entry> - <entry>A full textual representation of the day of the week</entry> - <entry><literal>Sunday</literal> through <literal>Saturday</literal></entry> + <entry align="center"><emphasis>Month</emphasis></entry> + <entry>---</entry> + <entry>---</entry> </row> <row> - <entry><literal>L</literal></entry> - <entry>Whether it's a leap year</entry> - <entry><literal>1</literal> if it is a leap year, <literal>0</literal> otherwise.</entry> + <entry><literal>F</literal></entry> + <entry>A full textual representation of a month, such as January or March</entry> + <entry><literal>January</literal> through <literal>December</literal></entry> </row> <row> <entry><literal>m</literal></entry> @@ -148,67 +131,99 @@ <entry><literal>1</literal> through <literal>12</literal></entry> </row> <row> - <entry><literal>O</literal></entry> - <entry>Difference to Greenwich time (GMT) in hours</entry> - <entry>Example: <literal>+0200</literal></entry> + <entry><literal>t</literal></entry> + <entry>Number of days in the given month</entry> + <entry><literal>28</literal> through <literal>31</literal></entry> </row> <row> - <entry><literal>r</literal></entry> - <entry><ulink url="&url.rfc;2822">RFC 2822</ulink> formatted date</entry> - <entry>Example: <literal>Thu, 21 Dec 2000 16:01:07 +0200</literal></entry> + <entry align="center"><emphasis>Year</emphasis></entry> + <entry>---</entry> + <entry>---</entry> </row> <row> - <entry><literal>s</literal></entry> - <entry>Seconds, with leading zeros</entry> - <entry><literal>00</literal> through <literal>59</literal></entry> + <entry><literal>L</literal></entry> + <entry>Whether it's a leap year</entry> + <entry><literal>1</literal> if it is a leap year, <literal>0</literal> otherwise.</entry> </row> <row> - <entry><literal>S</literal></entry> - <entry>English ordinal suffix for the day of the month, 2 characters</entry> - <entry> - <literal>st</literal>, <literal>nd</literal>, <literal>rd</literal> or - <literal>th</literal>. Works well with <literal>j</literal> - </entry> + <entry><literal>Y</literal></entry> + <entry>A full numeric representation of a year, 4 digits</entry> + <entry>Examples: <literal>1999</literal> or <literal>2003</literal></entry> </row> <row> - <entry><literal>t</literal></entry> - <entry>Number of days in the given month</entry> - <entry><literal>28</literal> through <literal>31</literal></entry> + <entry><literal>y</literal></entry> + <entry>A two digit representation of a year</entry> + <entry>Examples: <literal>99</literal> or <literal>03</literal></entry> </row> <row> - <entry><literal>T</literal></entry> - <entry>Timezone setting of this machine</entry> - <entry>Examples: <literal>EST</literal>, <literal>MDT</literal> ...</entry> + <entry align="center"><emphasis>Time</emphasis></entry> + <entry>---</entry> + <entry>---</entry> </row> <row> - <entry><literal>U</literal></entry> - <entry>Seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)</entry> - <entry>See also <function>time</function></entry> + <entry><literal>a</literal></entry> + <entry>Lowercase Ante meridiem and Post meridiem</entry> + <entry><literal>am</literal> or <literal>pm</literal></entry> </row> <row> - <entry><literal>w</literal></entry> - <entry>Numeric representation of the day of the week</entry> - <entry><literal>0</literal> (for Sunday) through <literal>6</literal> (for Saturday)</entry> + <entry><literal>A</literal></entry> + <entry>Uppercase Ante meridiem and Post meridiem</entry> + <entry><literal>AM</literal> or <literal>PM</literal></entry> </row> <row> - <entry><literal>W</literal></entry> - <entry>ISO-8601 week number of year, weeks starting on Monday (added in PHP 4.1.0)</entry> - <entry>Example: <literal>42</literal> (the 42nd week in the year)</entry> + <entry><literal>B</literal></entry> + <entry>Swatch Internet time</entry> + <entry><literal>000</literal> through <literal>999</literal></entry> </row> <row> - <entry><literal>Y</literal></entry> - <entry>A full numeric representation of a year, 4 digits</entry> - <entry>Examples: <literal>1999</literal> or <literal>2003</literal></entry> + <entry><literal>g</literal></entry> + <entry>12-hour format of an hour without leading zeros</entry> + <entry><literal>1</literal> through <literal>12</literal></entry> </row> <row> - <entry><literal>y</literal></entry> - <entry>A two digit representation of a year</entry> - <entry>Examples: <literal>99</literal> or <literal>03</literal></entry> + <entry><literal>G</literal></entry> + <entry>24-hour format of an hour without leading zeros</entry> + <entry><literal>0</literal> through <literal>23</literal></entry> </row> <row> - <entry><literal>z</literal></entry> - <entry>The day of the year (starting from 0)</entry> - <entry><literal>0</literal> through <literal>365</literal></entry> + <entry><literal>h</literal></entry> + <entry>12-hour format of an hour with leading zeros</entry> + <entry><literal>01</literal> through <literal>12</literal></entry> + </row> + <row> + <entry><literal>H</literal></entry> + <entry>24-hour format of an hour with leading zeros</entry> + <entry><literal>00</literal> through <literal>23</literal></entry> + </row> + <row> + <entry><literal>i</literal></entry> + <entry>Minutes with leading zeros</entry> + <entry><literal>00</literal> to <literal>59</literal></entry> + </row> + <row> + <entry><literal>s</literal></entry> + <entry>Seconds, with leading zeros</entry> + <entry><literal>00</literal> through <literal>59</literal></entry> + </row> + <row> + <entry align="center"><emphasis>Timezone</emphasis></entry> + <entry>---</entry> + <entry>---</entry> + </row> + <row> + <entry><literal>I</literal> (capital i)</entry> + <entry>Whether or not the date is in daylights savings time</entry> + <entry><literal>1</literal> if Daylight Savings Time, <literal>0</literal> otherwise.</entry> + </row> + <row> + <entry><literal>O</literal></entry> + <entry>Difference to Greenwich time (GMT) in hours</entry> + <entry>Example: <literal>+0200</literal></entry> + </row> + <row> + <entry><literal>T</literal></entry> + <entry>Timezone setting of this machine</entry> + <entry>Examples: <literal>EST</literal>, <literal>MDT</literal> ...</entry> </row> <row> <entry><literal>Z</literal></entry> @@ -216,6 +231,26 @@ negative, and for those east of UTC is always positive.</entry> <entry><literal>-43200</literal> through <literal>43200</literal></entry> </row> + <row> + <entry align="center"><emphasis>Full Date/Time</emphasis></entry> + <entry>---</entry> + <entry>---</entry> + </row> + <row> + <entry><literal>c</literal></entry> + <entry>ISO 8601 date (added in PHP 5)</entry> + <entry>2004-02-12T15:19:21+00:00</entry> + </row> + <row> + <entry><literal>r</literal></entry> + <entry><ulink url="&url.rfc;2822">RFC 2822</ulink> formatted date</entry> + <entry>Example: <literal>Thu, 21 Dec 2000 16:01:07 +0200</literal></entry> + </row> + <row> + <entry><literal>U</literal></entry> + <entry>Seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)</entry> + <entry>See also <function>time</function></entry> + </row> </tbody> </tgroup> </table>