From bd4aaaff50cf7d0da3b4dd76de123c983a3649e0 Mon Sep 17 00:00:00 2001
From: Hannes Magnusson <bjori@php.net>
Date: Sun, 21 Jun 2009 20:40:24 +0000
Subject: [PATCH] - Fixed bug#47899 (DateTimeZone::listIdentifiers()
 documentation is   ambigious) - Improved docs for the country parameter -
 Marked method as static

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@282530 c90b9560-bf6c-de11-be94-00142212c4b1
---
 .../datetime/datetimezone/listidentifiers.xml | 35 +++++++++++++++++--
 reference/datetime/versions.xml               |  4 +--
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/reference/datetime/datetimezone/listidentifiers.xml b/reference/datetime/datetimezone/listidentifiers.xml
index 0ee78946fb..7bb1944cdd 100644
--- a/reference/datetime/datetimezone/listidentifiers.xml
+++ b/reference/datetime/datetimezone/listidentifiers.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 
 <refentry xml:id="datetimezone.listidentifiers" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>array</type><methodname>DateTimeZone::listIdentifiers</methodname>
+   <modifier>static</modifier><type>array</type><methodname>DateTimeZone::listIdentifiers</methodname>
    <methodparam choice="opt"><type>int</type><parameter>what</parameter><initializer>DateTime::ALL</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>country</parameter><initializer>NULL</initializer></methodparam>
   </methodsynopsis>
@@ -40,6 +40,12 @@
       <para>
        A two-letter ISO 3166-1 compatible country code.
       </para>
+      <note>
+       <simpara>
+        This option is only used when <parameter>what</parameter> is set to
+        <constant>DateTimeZone::PER_COUNTRY</constant>.
+       </simpara>
+      </note>
      </listitem>
     </varlistentry>
    </variablelist>
@@ -53,6 +59,31 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>5.3.0</entry>
+       <entry>
+        Added the optional <parameter>what</parameter> and
+        <parameter>country</parameter> parameters.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>
+ 
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/datetime/versions.xml b/reference/datetime/versions.xml
index a4abed2258..a5742d86a4 100644
--- a/reference/datetime/versions.xml
+++ b/reference/datetime/versions.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!--
   Do NOT translate this file
 -->
@@ -31,7 +31,7 @@
  <function name='datetimezone::getoffset' from='PHP 5 &gt;= 5.2.0'/>
  <function name='datetimezone::gettransitions' from='PHP 5 &gt;= 5.2.0'/>
  <function name='datetimezone::listabbreviations' from='PHP 5 &gt;= 5.2.0'/>
- <function name='datetimezone::listidentifiers' from='PHP 5 &gt;= 5.3.0'/>
+ <function name='datetimezone::listidentifiers' from='PHP 5 &gt;= 5.2.0'/>
 
  <function name='dateinterval::__construct' from='PHP 5 &gt;= 5.3.0'/>
  <function name='dateinterval::createfromdatestring' from='PHP 5 &gt;= 5.3.0'/>