svn: /phpdoc/en/trunk/reference/datetime/datetime/ createfromformat.xml

salathe Sat, 22 May 2010 19:13:10 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=299631 Log: Correct description of special ! character. Fixes #51866 Bug: http://bugs.php.net/51866 (Assigned) DateTime::createFromFormat does not match documentation Changed paths: U phpdoc/en/trunk/reference/datetime/datetime/createfromformat.xml Modified: phpdoc/en/trunk/reference/datetime/datetime/createfromformat.xml =================================================================== --- phpdoc/en/trunk/reference/datetime/datetime/createfromformat.xml 2010-05-22 18:36:04 UTC (rev 299630) +++ phpdoc/en/trunk/reference/datetime/datetime/createfromformat.xml 2010-05-22 19:13:10 UTC (rev 299631) @@ -39,26 +39,18 @@ </para> <para> If <parameter>format</parameter> does not contain the character - <literal>!</literal> then portions of the date/time value - specified in <parameter>format</parameter> but not specified - in <parameter>time</parameter> will be set to the current + <literal>!</literal> then portions of the generated time which are not + specified in <parameter>format</parameter> will be set to the current system time. </para> <para> If <parameter>format</parameter> contains the character <literal>!</literal>, then portions of the generated - time specified to the left-hand side of - the <literal>!</literal> in <parameter>format</parameter> will + time not provided in <parameter>format</parameter>, as well as + values to the left-hand side of the <literal>!</literal>, will be set to corresponding values from the Unix epoch. </para> <para> - If the first character of <parameter>format</parameter> - is <literal>!</literal>, then all portions of the date/time - value generated which are not specified in - <parameter>time</parameter> will be initialized to corresponding - values from the Unix epoch. - </para> - <para> The Unix epoch is 1970-01-01 00:00:00 UTC. </para> </listitem>