From e8964e3b43d31aa29a94c3f87b9ebfd90c39bae3 Mon Sep 17 00:00:00 2001
From: Derick Rethans <derick@php.net>
Date: Tue, 13 Sep 2011 15:08:36 +0000
Subject: [PATCH] Fixed docs with changed behaviour in PHP 5.4.0 regarding
 timezone guessing.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@316651 c90b9560-bf6c-de11-be94-00142212c4b1
---
 .../functions/date-default-timezone-get.xml       | 15 ++++++++++++---
 reference/datetime/ini.xml                        |  9 +++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/reference/datetime/functions/date-default-timezone-get.xml b/reference/datetime/functions/date-default-timezone-get.xml
index a3ea1a4ad9..fea1c001ca 100644
--- a/reference/datetime/functions/date-default-timezone-get.xml
+++ b/reference/datetime/functions/date-default-timezone-get.xml
@@ -24,7 +24,8 @@
     </listitem>
     <listitem>
      <para>
-      Reading the <varname>TZ</varname> environment variable (if non empty) (Prior to PHP 5.3.0)
+      Prior to PHP 5.4.0 <emphasis>only</emphasis>: Reading the <varname>TZ</varname>
+      environment variable (if non empty)
      </para>
     </listitem>
     <listitem>
@@ -35,7 +36,8 @@
     </listitem>
     <listitem>
      <para>
-      Querying the host operating system (if supported and allowed by the OS). This uses an algorithm
+      Prior to PHP 5.4.0 <emphasis>only</emphasis>: Querying the host operating system (if supported
+      and allowed by the OS). This uses an algorithm
       that has to <emphasis>guess</emphasis> the timezone. This is by no means going to work correctly for 
       every situation. A warning is shown when this stage is reached. Do not rely on it to be guessed
       correctly, and set <link linkend="ini.date.timezone">date.timezone</link> to the correct timezone
@@ -70,12 +72,19 @@
      </thead>
      <tbody>
       <row>
-       <entry>5.3.0</entry>
+       <entry>5.4.0</entry>
        <entry>
         The <literal>TZ</literal> environment variable is no longer used to
         guess the timezone.
        </entry>
       </row>
+      <row>
+       <entry>5.4.0</entry>
+       <entry>
+        The timezone is no longer guessed from information available through the
+        operating system as the guessed timezone can not be relied on.
+       </entry>
+      </row>
      </tbody>
     </tgroup>
    </informaltable>
diff --git a/reference/datetime/ini.xml b/reference/datetime/ini.xml
index d4f4401f9e..8469fc645b 100644
--- a/reference/datetime/ini.xml
+++ b/reference/datetime/ini.xml
@@ -111,10 +111,11 @@
     </term>
     <listitem>
      <para>
-      Prior to PHP 5.3.0, the default timezone used by all date/time functions
-      if the <varname>TZ</varname> environment variable isn't set; this is
-      longer the case as of 5.3.0. The precedence order is described in
-      the <function>date_default_timezone_get</function> page. See <xref
+      The default timezone used by all date/time functions. Prior to PHP 5.4.0,
+      this would only work if the <varname>TZ</varname> environment variable
+      was not set. The precedence order for which timezone is used if none
+      is explicitly mentioned is described in the
+      <function>date_default_timezone_get</function> page. See <xref
       linkend="timezones"/> for a list of supported timezones.
      </para>
     </listitem>