From 5edd406c8c70510d52aaba60f40f355b921cd448 Mon Sep 17 00:00:00 2001 From: Maciek Sokolewicz Date: Mon, 8 Jun 2015 11:55:29 +0000 Subject: [PATCH] removed illegal "000" example from the doy format (as per note#113201) & reordered the example values to correspond to the actual format git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@336882 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/datetime/formats.xml | 81 ++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 37 deletions(-) diff --git a/reference/datetime/formats.xml b/reference/datetime/formats.xml index d39009ef61..8545f90916 100644 --- a/reference/datetime/formats.xml +++ b/reference/datetime/formats.xml @@ -2,7 +2,7 @@ Supported Date and Time Formats - + This section describes all the different formats that the strtotime, DateTime @@ -16,7 +16,7 @@ double quotes are case-sensitive ("T" is only T). - + Time Formats @@ -26,7 +26,7 @@ strtotime, DateTime and date_create parser understands. - + Used Symbols @@ -36,6 +36,13 @@ Formats Examples + + + &reftitle.unicode; + + Information specific to unicode, from the PHP 6 changes. + + @@ -86,7 +93,7 @@
- + 12 Hour Notation @@ -121,7 +128,7 @@
- + 24 Hour Notation @@ -173,7 +180,7 @@
- + Date Formats @@ -183,7 +190,7 @@ strtotime, DateTime and date_create parser understands. - + Used Symbols @@ -213,16 +220,16 @@ m 'january' | 'february' | 'march' | 'april' | 'may' | 'june' | - 'july' | 'august' | 'september' | 'october' | 'november' | 'december' | - 'jan' | 'feb' | 'mar' | 'apr' | 'may' | 'jun' | 'jul' | 'aug' | 'sep' | - 'sept' | 'oct' | 'nov' | 'dec' | "I" | "II" | "III" | "IV" | "V" | "VI" - | "VII" | "VIII" | "IX" | "X" | "XI" | "XII" + 'july' | 'august' | 'september' | 'october' | 'november' | 'december' | + 'jan' | 'feb' | 'mar' | 'apr' | 'may' | 'jun' | 'jul' | 'aug' | 'sep' | + 'sept' | 'oct' | 'nov' | 'dec' | "I" | "II" | "III" | "IV" | "V" | "VI" + | "VII" | "VIII" | "IX" | "X" | "XI" | "XII" M 'jan' | 'feb' | 'mar' | 'apr' | 'may' | 'jun' | 'jul' | 'aug' | - 'sep' | 'sept' | 'oct' | 'nov' | 'dec' + 'sep' | 'sept' | 'oct' | 'nov' | 'dec' @@ -253,7 +260,7 @@
- + Localized Notations @@ -388,7 +395,7 @@
- + For the y and yy @@ -400,7 +407,7 @@ interpreted as "2000-01-01". - + The "Day, month and two digit year, with dots or tabs" format @@ -411,7 +418,7 @@ [.:] SS" has precedence. - + The "Year (and just the year)" format only works if a time string @@ -419,7 +426,7 @@ HH MM. - + It is possible to over- and underflow the dd and @@ -445,17 +452,17 @@ - + Compound Formats - + This page describes the different compound date/time formats that the strtotime, DateTime and date_create parser understands. - + Used Symbols @@ -475,7 +482,7 @@ doy "00"[1-9] | "0"[1-9][0-9] | [1-2][0-9][0-9] | "3"[0-5][0-9] | "36"[0-6] - "36"[0-6] "000", "012", "366" + "001", "012", "180", "350", "366" frac @@ -550,7 +557,7 @@
- + Localized Notations @@ -620,7 +627,7 @@
- + The "W" in the "ISO year with ISO week" and "ISO year with ISO week @@ -637,7 +644,7 @@ - + Relative Formats @@ -646,7 +653,7 @@ strtotime, DateTime and date_create parser understands. - + Used Symbols @@ -660,8 +667,8 @@ dayname 'sunday' | 'monday' | 'tuesday' | 'wednesday' | 'thursday' | - 'friday' | 'saturday' | 'sun' | 'mon' | 'tue' | 'wed' | 'thu' | 'fri' | - 'sat' + 'friday' | 'saturday' | 'sun' | 'mon' | 'tue' | 'wed' | 'thu' | 'fri' | + 'sat' daytext @@ -674,8 +681,8 @@ ordinal 'first' | 'second' | 'third' | 'fourth' | 'fifth' | 'sixth' | - 'seventh' | 'eighth' | 'ninth' | 'tenth' | 'eleventh' | 'twelfth' | - 'next' | 'last' | 'previous' | 'this' + 'seventh' | 'eighth' | 'ninth' | 'tenth' | 'eleventh' | 'twelfth' | + 'next' | 'last' | 'previous' | 'this' reltext @@ -688,13 +695,13 @@ unit (('sec' | 'second' | 'min' | 'minute' | 'hour' | 'day' | - 'fortnight' | 'forthnight' | 'month' | 'year') 's'?) | 'weeks' | - daytext + 'fortnight' | 'forthnight' | 'month' | 'year') 's'?) | 'weeks' | + daytext
- + Day-based Notations @@ -749,13 +756,13 @@ 'first day of' Sets the day of the first of the current month. This phrase is - best used together with a month name following it. + best used together with a month name following it. "first day of January 2008" 'last day of' Sets the day to the last day of the current month. This phrase is - best used together with a month name following it. + best used together with a month name following it. "last day of next month" @@ -796,7 +803,7 @@
- + Relative statements are always processed after @@ -812,7 +819,7 @@ five statements directly influence the current time. - + Observe the following remarks when the current day-of-week is the @@ -952,7 +959,7 @@ - +