From 7871a46bbb89d65909da903d15da3d1891d7846c Mon Sep 17 00:00:00 2001
From: Nuno Lopes <nlopess@php.net>
Date: Fri, 29 Jul 2005 18:16:29 +0000
Subject: [PATCH] update the date_default_*() to reflect last CVS commits

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@191821 c90b9560-bf6c-de11-be94-00142212c4b1
---
 .../functions/date-default-timezone-get.xml   | 40 ++++++++++++++++---
 .../functions/date-default-timezone-set.xml   | 33 +--------------
 reference/datetime/ini.xml                    |  4 +-
 3 files changed, 37 insertions(+), 40 deletions(-)

diff --git a/reference/datetime/functions/date-default-timezone-get.xml b/reference/datetime/functions/date-default-timezone-get.xml
index d3d17774a6..2b16ddc0f4 100755
--- a/reference/datetime/functions/date-default-timezone-get.xml
+++ b/reference/datetime/functions/date-default-timezone-get.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="function.date-default-timezone-get">
  <refnamediv>
   <refname>date_default_timezone_get</refname>
@@ -14,16 +14,44 @@
    <void/>
   </methodsynopsis>
   <para>
-   This functions returns the default timezone previously set by
-   <function>date_default_timezone_set</function>.
-  </para>
+   This functions returns the default timezone, using the following "guess"
+   order:
+   <itemizedlist>
+    <listitem>
+     <para>
+      The timezone set using the
+      <function>date_default_timezone_set</function> function (if any)
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      The <varname>TZ</varname> environment variable (if non empty)
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      The <link linkend="ini.date.timezone">date.timezone</link> ini option
+      (if set)
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      "magical" guess (if the operating system supports it)
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      If none of the above options succeeds, falback to <literal>UTC</literal>
+     </para>
+    </listitem>
+   </itemizedlist>
+  </para>  
  </refsect1>
  
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns a <type>string</type> on success, or &false; if the default
-   timezone wasn't set yet.
+   Returns a <type>string</type>.
   </para>
  </refsect1>
 
diff --git a/reference/datetime/functions/date-default-timezone-set.xml b/reference/datetime/functions/date-default-timezone-set.xml
index 0e98aa9861..ff0b9cc002 100755
--- a/reference/datetime/functions/date-default-timezone-set.xml
+++ b/reference/datetime/functions/date-default-timezone-set.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="function.date-default-timezone-set">
  <refnamediv>
   <refname>date_default_timezone_set</refname>
@@ -17,37 +17,6 @@
    <function>date_default_timezone_set</function> sets the default timezone
    used by all date/time functions.
   </para>
-  <para>
-   The order that PHP tries to find the default timezone is the following:
-   <itemizedlist>
-    <listitem>
-     <para>
-      The timezone set using this function (if any)
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      The <varname>TZ</varname> environment variable (if set)
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      The <link linkend="ini.date.timezone">date.timezone</link> ini option
-      (if set)
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      "magical" guess (if the operating system supports it)
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      If none of the above options succeeds, falback to <literal>UTC</literal>
-     </para>
-    </listitem>
-   </itemizedlist>
-  </para>
   <note>
    <para>
     Since PHP 5.1.0 (when the date/time functions were rewritten), every call
diff --git a/reference/datetime/ini.xml b/reference/datetime/ini.xml
index fdee3f4707..9f6d938ed2 100755
--- a/reference/datetime/ini.xml
+++ b/reference/datetime/ini.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <section id="datetime.configuration">
  &reftitle.runtime;
  &extension.runtime;
@@ -113,7 +113,7 @@
      <para>
       The default timezone used by all date/time functions if the
       <varname>TZ</varname> environment variable isn't set. The precedence
-      order is described in the <function>date_default_timezone_set</function>
+      order is described in the <function>date_default_timezone_get</function>
       page.
      </para>
     </listitem>