com doc/ja: Generate intl methodsynopses - IntlDateFormatter: reference/intl/dateformatter.xml reference/intl/dateformatter/create.xml reference/intl/dateformatter/format.xml reference/intl/dateformatter/formatobject.xml reference/intl/dateformatter/get-calendar.xml reference/intl/dateformatter/get-datetype.xml reference/intl/dateformatter/get-error-code.xml reference/intl/dateformatter/get-error-message.xml reference/intl/dateformatter/get-local

[email protected] (Yoshinari Takaoka) Sat, 13 Feb 2021 18:11:11 +0000
Newsgroups php.doc.ja
Message-ID <[email protected]>
Commit:    6727e58e0cfdd0a194c56c8cc9b8cd8c83da0d96
Author:    Yoshinari Takaoka <[email protected]>         Sun, 14 Feb 2021 03:11:11 +0900
Parents:   a36edc502f917eda93c369fb10f3152f910e18e0
Branches:  master

Link:       http://git.php.net/?p=doc/ja.git;a=commitdiff;h=6727e58e0cfdd0a194c56c8cc9b8cd8c83da0d96

Log:
Generate intl methodsynopses - IntlDateFormatter

Co-authored-by: Christoph M. Becker <[email protected]>

Closes GH-340.

Changed paths:
  M  reference/intl/dateformatter.xml
  M  reference/intl/dateformatter/create.xml
  M  reference/intl/dateformatter/format.xml
  M  reference/intl/dateformatter/formatobject.xml
  M  reference/intl/dateformatter/get-calendar.xml
  M  reference/intl/dateformatter/get-datetype.xml
  M  reference/intl/dateformatter/get-error-code.xml
  M  reference/intl/dateformatter/get-error-message.xml
  M  reference/intl/dateformatter/get-locale.xml
  M  reference/intl/dateformatter/get-pattern.xml
  M  reference/intl/dateformatter/get-timetype.xml
  M  reference/intl/dateformatter/get-timezone-id.xml
  M  reference/intl/dateformatter/getcalendarobject.xml
  M  reference/intl/dateformatter/gettimezone.xml
  M  reference/intl/dateformatter/is-lenient.xml
  M  reference/intl/dateformatter/localtime.xml
  M  reference/intl/dateformatter/parse.xml
  M  reference/intl/dateformatter/set-calendar.xml
  M  reference/intl/dateformatter/set-lenient.xml
  M  reference/intl/dateformatter/set-pattern.xml
  M  reference/intl/dateformatter/settimezone.xml
diff_6727e58e0cfdd0a194c56c8cc9b8cd8c83da0d96.txt (text/plain, 57.4 KB)
diff --git a/reference/intl/dateformatter.xml b/reference/intl/dateformatter.xml
index eb991e5ecf..fe08952007 100644
--- a/reference/intl/dateformatter.xml
+++ b/reference/intl/dateformatter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 1d137d406b33b8c9e9f470808b14ca5976a29465 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: ce46b05403346a4b21937db0b923173431104145 Maintainer: takagi Status: ready -->
 <phpdoc:classref xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="class.intldateformatter" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>IntlDateFormatter クラス</title>
  <titleabbrev>IntlDateFormatter</titleabbrev>
@@ -42,9 +42,9 @@
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include
-     xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.intldateformatter')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[1])" />
+     xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.intldateformatter')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
     <xi:include
-     xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.intldateformatter')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+     xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.intldateformatter')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
    </classsynopsis>
    <!-- }}} -->
 
diff --git a/reference/intl/dateformatter/create.xml b/reference/intl/dateformatter/create.xml
index 01633c85d5..aa87d638f8 100644
--- a/reference/intl/dateformatter/create.xml
+++ b/reference/intl/dateformatter/create.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 9905374cd0b37a55542a68eedac9cf59521f59c9 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: ce46b05403346a4b21937db0b923173431104145 Maintainer: takagi Status: ready -->
 <refentry xml:id="intldateformatter.create" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>IntlDateFormatter::create</refname>
@@ -13,40 +13,37 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>IntlDateFormatter</type><methodname>IntlDateFormatter::create</methodname>
-   <methodparam><type>string</type><parameter>locale</parameter></methodparam>
-   <methodparam><type>int</type><parameter>datetype</parameter></methodparam>
-   <methodparam><type>int</type><parameter>timetype</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>timezone</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>calendar</parameter><initializer>NULL</initializer></methodparam>
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>IntlDateFormatter</type><type>null</type></type><methodname>IntlDateFormatter::create</methodname>
+   <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>locale</parameter></methodparam>
+   <methodparam><type>int</type><parameter>dateType</parameter></methodparam>
+   <methodparam><type>int</type><parameter>timeType</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>IntlTimeZone</type><type>DateTimeZone</type><type>string</type><type>null</type></type><parameter>timezone</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>IntlCalendar</type><type>int</type><type>null</type></type><parameter>calendar</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>pattern</parameter><initializer>""</initializer></methodparam>
   </methodsynopsis>
   <para>
    &style.oop; (コンストラクタ)
   </para>
   <constructorsynopsis>
-   <modifier>public</modifier>
-   <methodname>IntlDateFormatter::__construct</methodname>
-   <methodparam><type>string</type><parameter>locale</parameter></methodparam>
-   <methodparam><type>int</type><parameter>datetype</parameter></methodparam>
-   <methodparam><type>int</type><parameter>timetype</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>timezone</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>calendar</parameter><initializer>NULL</initializer></methodparam>
+   <modifier>public</modifier> <methodname>IntlDateFormatter::__construct</methodname>
+   <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>locale</parameter></methodparam>
+   <methodparam><type>int</type><parameter>dateType</parameter></methodparam>
+   <methodparam><type>int</type><parameter>timeType</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>IntlTimeZone</type><type>DateTimeZone</type><type>string</type><type>null</type></type><parameter>timezone</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>IntlCalendar</type><type>int</type><type>null</type></type><parameter>calendar</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>pattern</parameter><initializer>""</initializer></methodparam>
   </constructorsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>IntlDateFormatter</type><methodname>datefmt_create</methodname>
-   <methodparam><type>string</type><parameter>locale</parameter></methodparam>
-   <methodparam><type>int</type><parameter>datetype</parameter></methodparam>
-   <methodparam><type>int</type><parameter>timetype</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>timezone</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>calendar</parameter><initializer>NULL</initializer></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>IntlDateFormatter</type><type>null</type></type><methodname>datefmt_create</methodname>
+   <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>locale</parameter></methodparam>
+   <methodparam><type>int</type><parameter>dateType</parameter></methodparam>
+   <methodparam><type>int</type><parameter>timeType</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>IntlTimeZone</type><type>DateTimeZone</type><type>string</type><type>null</type></type><parameter>timezone</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>IntlCalendar</type><type>int</type><type>null</type></type><parameter>calendar</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>pattern</parameter><initializer>""</initializer></methodparam>
   </methodsynopsis>
   <para>
@@ -70,7 +67,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>datetype</parameter></term>
+     <term><parameter>dateType</parameter></term>
      <listitem>
       <para>
        使用する日付の形式 (<constant>none</constant>,
@@ -83,7 +80,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>timetype</parameter></term>
+     <term><parameter>timeType</parameter></term>
      <listitem>
       <para>
        使用する時刻の形式 (<constant>none</constant>, 
@@ -146,7 +143,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   作成された <classname>IntlDateFormatter</classname> を返します。失敗した場合は &false; を返します。
+   作成された <classname>IntlDateFormatter</classname> を返します。失敗した場合は &null; を返します。
   </para>
  </refsect1>
 
@@ -259,7 +256,6 @@ Second Formatted output with pattern is 12/31/1969
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/format.xml b/reference/intl/dateformatter/format.xml
index 3f6a167040..c9477af620 100644
--- a/reference/intl/dateformatter/format.xml
+++ b/reference/intl/dateformatter/format.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 7f569e1f175adf1fbd0e462eba8d6bc82214c939 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: ce46b05403346a4b21937db0b923173431104145 Maintainer: takagi Status: ready -->
 <!-- Credits: mumumu -->
 <refentry xml:id="intldateformatter.format" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -13,17 +13,17 @@
   <para>
    &style.oop;
   </para>
-   <methodsynopsis>
-    <modifier>public</modifier> <type>string</type><methodname>IntlDateFormatter::format</methodname>
-    <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-   </methodsynopsis>
+   <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>IntlDateFormatter::format</methodname>
+   <methodparam><type class="union"><type>IntlCalendar</type><type>DateTimeInterface</type><type>array</type><type>string</type><type>int</type><type>float</type></type><parameter>datetime</parameter></methodparam>
+  </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>string</type><methodname>datefmt_format</methodname>
-  <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
-  <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>string</type><type>false</type></type><methodname>datefmt_format</methodname>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
+   <methodparam><type class="union"><type>IntlCalendar</type><type>DateTimeInterface</type><type>array</type><type>string</type><type>int</type><type>float</type></type><parameter>datetime</parameter></methodparam>
   </methodsynopsis>
   <para>
    時刻の値を文字列としてフォーマットします。
@@ -35,7 +35,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        Date Formatter リソース。
@@ -43,7 +43,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>value</parameter></term>
+     <term><parameter>datetime</parameter></term>
      <listitem>
       <para>
        フォーマットする値。<classname>DateTimeInterface</classname> オブジェクト、
@@ -91,7 +91,7 @@
       <row>
        <entry>7.1.5</entry>
        <entry>
-        <parameter>value</parameter> パラメータに
+        <parameter>datetime</parameter> パラメータに
         一般的な <classname>DateTimeInterface</classname> オブジェクトのサポートが追加されました。
         これより前のバージョンでは、<classname>DateTime</classname> オブジェクトのみがサポートされていました。
        </entry>
@@ -100,7 +100,7 @@
        <entry>PECL 3.0.0</entry>
        <entry>
         <classname>IntlCalendar</classname> オブジェクトを
-        <parameter>value</parameter> に渡せるようになりました。
+        <parameter>datetime</parameter> に渡せるようになりました。
        </entry>
       </row>
      </tbody>
@@ -272,7 +272,6 @@ After changing timezone:
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/formatobject.xml b/reference/intl/dateformatter/formatobject.xml
index 2199e3560b..90ea3ba4a0 100644
--- a/reference/intl/dateformatter/formatobject.xml
+++ b/reference/intl/dateformatter/formatobject.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: b95d28e6ec86e4a71e012737d36ebdc1cf009180 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: ce46b05403346a4b21937db0b923173431104145 Maintainer: takagi Status: ready -->
 <!-- Credits: mumumu -->
 
 <refentry xml:id="intldateformatter.formatobject" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -15,21 +15,20 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
+  <methodsynopsis role="oop">
    <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>IntlDateFormatter::formatObject</methodname>
-   <methodparam><type>object</type><parameter>object</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>format</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>locale</parameter><initializer>NULL</initializer></methodparam>
+   <methodparam><type class="union"><type>IntlCalendar</type><type>DateTime</type></type><parameter>datetime</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>array</type><type>int</type><type>string</type><type>null</type></type><parameter>format</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>locale</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier>
+  <methodsynopsis role="procedural">
    <type class="union"><type>string</type><type>false</type></type><methodname>datefmt_format_object</methodname>
-   <methodparam><type>object</type><parameter>object</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>format</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>locale</parameter><initializer>NULL</initializer></methodparam>
+   <methodparam><type class="union"><type>IntlCalendar</type><type>DateTimeInterface</type></type><parameter>datetime</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>array</type><type>int</type><type>string</type><type>null</type></type><parameter>format</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>locale</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
 
   <para>
@@ -51,7 +50,7 @@
   &reftitle.parameters;
   <variablelist>
    <varlistentry>
-    <term><parameter>object</parameter></term>
+    <term><parameter>datetime</parameter></term>
     <listitem>
      <para>
       <classname>IntlCalendar</classname> あるいは
@@ -160,7 +159,6 @@ with DateTime:
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/get-calendar.xml b/reference/intl/dateformatter/get-calendar.xml
index b0f8ecd08a..7ff3f10f40 100644
--- a/reference/intl/dateformatter/get-calendar.xml
+++ b/reference/intl/dateformatter/get-calendar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 67923ad06fbfd6ad318662de2af936874dfd7bbd Maintainer: takagi Status: ready -->
+<!-- EN-Revision: ce46b05403346a4b21937db0b923173431104145 Maintainer: takagi Status: ready -->
 <!-- Credits: mumumu -->
 <refentry xml:id="intldateformatter.getcalendar" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -13,16 +13,16 @@
   <para>
    &style.oop;
   </para>
-   <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>IntlDateFormatter::getCalendar</methodname>
-   <void />
-   </methodsynopsis>
+   <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>int</type><type>false</type></type><methodname>IntlDateFormatter::getCalendar</methodname>
+   <void/>
+  </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>int</type><methodname>datefmt_get_calendar</methodname>
-  <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>int</type><type>false</type></type><methodname>datefmt_get_calendar</methodname>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
   </methodsynopsis>
   <para>
   </para> 
@@ -33,7 +33,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        Formatter リソース。
@@ -53,6 +53,7 @@
    を返します。
    <constant>IntlDateFormatter::TRADITIONAL</constant> あるいは
    <constant>IntlDateFormatter::GREGORIAN</constant> です。
+   失敗時に &false; を返します。
   </para>
  </refsect1>
  
@@ -117,7 +118,6 @@ Now calendar of the formatter is : 0
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/get-datetype.xml b/reference/intl/dateformatter/get-datetype.xml
index a7aaadd727..ea2b3d0eb1 100644
--- a/reference/intl/dateformatter/get-datetype.xml
+++ b/reference/intl/dateformatter/get-datetype.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 9643097fc3c3e26ba4545e77a150628b9b8e9230 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: ce46b05403346a4b21937db0b923173431104145 Maintainer: takagi Status: ready -->
 <refentry xml:id="intldateformatter.getdatetype" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>IntlDateFormatter::getDateType</refname>
@@ -12,16 +12,16 @@
   <para>
    &style.oop;
   </para>
-   <methodsynopsis>
-    <modifier>public</modifier> <type>int</type><methodname>IntlDateFormatter::getDateType</methodname>
-    <void />
-   </methodsynopsis>
+   <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>int</type><type>false</type></type><methodname>IntlDateFormatter::getDateType</methodname>
+   <void/>
+  </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>int</type><methodname>datefmt_get_datetype</methodname>
-  <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>int</type><type>false</type></type><methodname>datefmt_get_datetype</methodname>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
   </methodsynopsis>
   <para>
      Formatter が使用する日付形式を返します。
@@ -33,7 +33,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        Formatter リソース。
@@ -50,6 +50,7 @@
   <para>
    Formatter の現在の <link linkend="intl.intldateformatter-constants">日付形式</link>
    の値を返します。
+   &return.falseforfailure;
   </para>
  </refsect1>
  
@@ -133,7 +134,6 @@ Second Formatted output is 12/31/69 4:00:00 PM PT
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/get-error-code.xml b/reference/intl/dateformatter/get-error-code.xml
index 212928b516..8ed517dbc2 100644
--- a/reference/intl/dateformatter/get-error-code.xml
+++ b/reference/intl/dateformatter/get-error-code.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 9643097fc3c3e26ba4545e77a150628b9b8e9230 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: ce46b05403346a4b21937db0b923173431104145 Maintainer: takagi Status: ready -->
 <refentry xml:id="intldateformatter.geterrorcode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>IntlDateFormatter::getErrorCode</refname>
@@ -12,16 +12,16 @@
   <para>
    &style.oop;
   </para>
-   <methodsynopsis>
-    <modifier>public</modifier> <type>int</type><methodname>IntlDateFormatter::getErrorCode</methodname>
-    <void />
-   </methodsynopsis>
+   <methodsynopsis role="oop">
+   <modifier>public</modifier> <type>int</type><methodname>IntlDateFormatter::getErrorCode</methodname>
+   <void/>
+  </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
+  <methodsynopsis role="procedural">
    <type>int</type><methodname>datefmt_get_error_code</methodname>
-  <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
   </methodsynopsis>
   <para>
    直近の操作のエラーコードを取得します。
@@ -34,7 +34,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        Formatter リソース。
@@ -122,7 +122,6 @@ ERROR: U_ZERO_ERROR (0)
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/get-error-message.xml b/reference/intl/dateformatter/get-error-message.xml
index f54583308d..f0f8029636 100644
--- a/reference/intl/dateformatter/get-error-message.xml
+++ b/reference/intl/dateformatter/get-error-message.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 9e4c917c09b4eed089d61074189ef81934a9dd23 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: ce46b05403346a4b21937db0b923173431104145 Maintainer: takagi Status: ready -->
 <!-- Credits: mumumu -->
 <refentry xml:id="intldateformatter.geterrormessage" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -13,16 +13,16 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
+  <methodsynopsis role="oop">
    <modifier>public</modifier> <type>string</type><methodname>IntlDateFormatter::getErrorMessage</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
+  <methodsynopsis role="procedural">
    <type>string</type><methodname>datefmt_get_error_message</methodname>
-   <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
   </methodsynopsis>
   <para>
    直近の操作のエラーテキストを取得します。
@@ -34,7 +34,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        Formatter リソース。
@@ -123,7 +123,6 @@ ERROR: U_ZERO_ERROR (0)
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/get-locale.xml b/reference/intl/dateformatter/get-locale.xml
index ebace31d9c..d4128d086b 100644
--- a/reference/intl/dateformatter/get-locale.xml
+++ b/reference/intl/dateformatter/get-locale.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: a5f69d2d8afdbe60155b74a9a11988b18e789325 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: ce46b05403346a4b21937db0b923173431104145 Maintainer: takagi Status: ready -->
 <refentry xml:id="intldateformatter.getlocale" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>IntlDateFormatter::getLocale</refname>
@@ -12,17 +12,17 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>IntlDateFormatter::getLocale</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>which</parameter></methodparam>
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>IntlDateFormatter::getLocale</methodname>
+   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer><constant>ULOC_ACTUAL_LOCALE</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>string</type><methodname>datefmt_get_locale</methodname>
-   <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>which</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>string</type><type>false</type></type><methodname>datefmt_get_locale</methodname>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer><constant>ULOC_ACTUAL_LOCALE</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
    Formatter が使用するロケールを取得します。
@@ -34,7 +34,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        Formatter リソース。
@@ -42,7 +42,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>which</parameter></term>
+     <term><parameter>type</parameter></term>
      <listitem>
       <para>
        妥当なロケールか実際のロケール (それぞれ
@@ -60,7 +60,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   この Formatter のロケール、あるいはエラーの場合は 'false' を返します。
+   この Formatter のロケールを返します。
+   &return.falseforfailure;
   </para>
  </refsect1>
  
@@ -144,7 +145,6 @@ Second Formatted output is Mittwoch, 31. Dezember 1969 16:00 Uhr GMT-08:00
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/get-pattern.xml b/reference/intl/dateformatter/get-pattern.xml
index af877fc4f7..8048f1cc48 100644
--- a/reference/intl/dateformatter/get-pattern.xml
+++ b/reference/intl/dateformatter/get-pattern.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 9643097fc3c3e26ba4545e77a150628b9b8e9230 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: ce46b05403346a4b21937db0b923173431104145 Maintainer: takagi Status: ready -->
 <refentry xml:id="intldateformatter.getpattern" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>IntlDateFormatter::getPattern</refname>
@@ -12,16 +12,16 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>IntlDateFormatter::getPattern</methodname>
-   <void />
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>IntlDateFormatter::getPattern</methodname>
+   <void/>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>string</type><methodname>datefmt_get_pattern</methodname>
-   <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>string</type><type>false</type></type><methodname>datefmt_get_pattern</methodname>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
   </methodsynopsis>
   <para>
    Formatter が使用するパターンを取得します。
@@ -33,7 +33,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        Formatter リソース。
@@ -49,6 +49,7 @@
   &reftitle.returnvalues;
   <para>
    フォーマット/パース 時に使用するパターン文字列を返します。
+   &return.falseforfailure;
   </para>
  </refsect1>
  
@@ -120,7 +121,6 @@ Second Formatted output is 19690031 04:00:00 PST
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/get-timetype.xml b/reference/intl/dateformatter/get-timetype.xml
index 53c260195a..3bdb9ead0e 100644
--- a/reference/intl/dateformatter/get-timetype.xml
+++ b/reference/intl/dateformatter/get-timetype.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 9643097fc3c3e26ba4545e77a150628b9b8e9230 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: ce46b05403346a4b21937db0b923173431104145 Maintainer: takagi Status: ready -->
 <refentry xml:id="intldateformatter.gettimetype" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>IntlDateFormatter::getTimeType</refname>
@@ -12,16 +12,16 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>IntlDateFormatter::getTimeType</methodname>
-   <void />
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>int</type><type>false</type></type><methodname>IntlDateFormatter::getTimeType</methodname>
+   <void/>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>int</type><methodname>datefmt_get_timetype</methodname>
-   <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>int</type><type>false</type></type><methodname>datefmt_get_timetype</methodname>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
   </methodsynopsis>
   <para>
    Formatter が使用する時刻形式を返します。
@@ -33,7 +33,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        Formatter リソース。
@@ -50,6 +50,7 @@
   <para>
    Formatter の現在の <link linkend="intl.intldateformatter-constants">日付形式</link>
    の値を返します。
+   &return.falseforfailure;
   </para>
  </refsect1>
  
@@ -134,7 +135,6 @@ Second Formatted output is Wednesday, December 31, 1969 4:00 PM
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/get-timezone-id.xml b/reference/intl/dateformatter/get-timezone-id.xml
index dc371b62d6..93bc24cd67 100644
--- a/reference/intl/dateformatter/get-timezone-id.xml
+++ b/reference/intl/dateformatter/get-timezone-id.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 9643097fc3c3e26ba4545e77a150628b9b8e9230 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: ce46b05403346a4b21937db0b923173431104145 Maintainer: takagi Status: ready -->
 <refentry xml:id="intldateformatter.gettimezoneid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>IntlDateFormatter::getTimeZoneId</refname>
@@ -12,16 +12,16 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>IntlDateFormatter::getTimeZoneId</methodname>
-   <void />
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>IntlDateFormatter::getTimeZoneId</methodname>
+   <void/>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>string</type><methodname>datefmt_get_timezone_id</methodname>
-   <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>string</type><type>false</type></type><methodname>datefmt_get_timezone_id</methodname>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
   </methodsynopsis>
   <para>
    IntlDateFormatter が使用するタイムゾーン ID を取得します。
@@ -33,7 +33,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        Formatter リソース。
@@ -49,6 +49,7 @@
   &reftitle.returnvalues;
   <para>
    この Formatter が使用するタイムゾーンの ID 文字列を返します。
+   &return.falseforfailure;
   </para>
  </refsect1>
  
@@ -113,7 +114,6 @@ Now timezone_id of the formatter is : CN
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/getcalendarobject.xml b/reference/intl/dateformatter/getcalendarobject.xml
index 6b380a0613..00eb4dcf21 100644
--- a/reference/intl/dateformatter/getcalendarobject.xml
+++ b/reference/intl/dateformatter/getcalendarobject.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 9643097fc3c3e26ba4545e77a150628b9b8e9230 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: ce46b05403346a4b21937db0b923173431104145 Maintainer: takagi Status: ready -->
 
 <refentry xml:id="intldateformatter.getcalendarobject" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -14,19 +14,16 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>IntlCalendar</type>
-   <methodname>IntlDateFormatter::getCalendarObject</methodname>
-   <void />
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>IntlCalendar</type><type>false</type><type>null</type></type><methodname>IntlDateFormatter::getCalendarObject</methodname>
+   <void/>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>IntlCalendar</type>
-   <methodname>datefmt_get_calendar_object</methodname>
-   <void />
+  <methodsynopsis role="procedural">
+   <type class="union"><type>IntlCalendar</type><type>false</type><type>null</type></type><methodname>datefmt_get_calendar_object</methodname>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
   </methodsynopsis>
 
   <para>
@@ -47,6 +44,8 @@
   &reftitle.returnvalues;
   <para>
    このフォーマッターが内部的に使うカレンダーオブジェクトのコピーを返します。
+   何も設定されなかった場合は &null; を返します。
+   &return.falseforfailure;
   </para>
  </refsect1>
 
@@ -109,7 +108,6 @@ string(5) "fr_FR"
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/gettimezone.xml b/reference/intl/dateformatter/gettimezone.xml
index 0d75baee99..ceb5013578 100644
--- a/reference/intl/dateformatter/gettimezone.xml
+++ b/reference/intl/dateformatter/gettimezone.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: b95d28e6ec86e4a71e012737d36ebdc1cf009180 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: ce46b05403346a4b21937db0b923173431104145 Maintainer: takagi Status: ready -->
 
 <refentry xml:id="intldateformatter.gettimezone" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -14,17 +14,16 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
+  <methodsynopsis role="oop">
    <modifier>public</modifier> <type class="union"><type>IntlTimeZone</type><type>false</type></type><methodname>IntlDateFormatter::getTimeZone</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type class="union"><type>IntlTimeZone</type><type>false</type></type>
-   <methodname>datefmt_get_timezone</methodname>
-   <void />
+  <methodsynopsis role="procedural">
+   <type class="union"><type>IntlTimeZone</type><type>false</type></type><methodname>datefmt_get_timezone</methodname>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
   </methodsynopsis>
 
   <para>
@@ -107,7 +106,6 @@ Europe/Lisbon
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/is-lenient.xml b/reference/intl/dateformatter/is-lenient.xml
index 57b3229f92..99407ad1a3 100644
--- a/reference/intl/dateformatter/is-lenient.xml
+++ b/reference/intl/dateformatter/is-lenient.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 9643097fc3c3e26ba4545e77a150628b9b8e9230 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: ce46b05403346a4b21937db0b923173431104145 Maintainer: takagi Status: ready -->
 <refentry xml:id="intldateformatter.islenient" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>IntlDateFormatter::isLenient</refname>
@@ -12,16 +12,16 @@
   <para>
    &style.oop;
   </para>
-   <methodsynopsis>
-    <modifier>public</modifier> <type>bool</type><methodname>IntlDateFormatter::isLenient</methodname>
-    <void />
-   </methodsynopsis>
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type>bool</type><methodname>IntlDateFormatter::isLenient</methodname>
+   <void/>
+  </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
+  <methodsynopsis role="procedural">
    <type>bool</type><methodname>datefmt_is_lenient</methodname>
-  <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
   </methodsynopsis>
   <para>
     パターンに正確にマッチしていない入力の処理を、
@@ -34,7 +34,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        Formatter リソース。
@@ -168,7 +168,6 @@ Error_code is : 9
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/localtime.xml b/reference/intl/dateformatter/localtime.xml
index c8f12a374d..37e92412a6 100644
--- a/reference/intl/dateformatter/localtime.xml
+++ b/reference/intl/dateformatter/localtime.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 9643097fc3c3e26ba4545e77a150628b9b8e9230 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: ce46b05403346a4b21937db0b923173431104145 Maintainer: takagi Status: ready -->
 <refentry xml:id="intldateformatter.localtime" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>IntlDateFormatter::localtime</refname>
@@ -12,19 +12,19 @@
   <para>
    &style.oop;
   </para>
-   <methodsynopsis>
-    <modifier>public</modifier> <type>array</type><methodname>IntlDateFormatter::localtime</methodname>
-    <methodparam><type>string</type><parameter>value</parameter></methodparam>
-    <methodparam choice="opt"><type>int</type><parameter role="reference">position</parameter></methodparam>
-   </methodsynopsis>
+   <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>array</type><type>false</type></type><methodname>IntlDateFormatter::localtime</methodname>
+   <methodparam><type>string</type><parameter>string</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter role="reference">offset</parameter><initializer>&null;</initializer></methodparam>
+  </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>array</type><methodname>datefmt_localtime</methodname>
-  <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
-  <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  <methodparam choice="opt"><type>int</type><parameter role="reference">position</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>array</type><type>false</type></type><methodname>datefmt_localtime</methodname>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
+   <methodparam><type>string</type><parameter>string</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter role="reference">offset</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    文字列 $value を変換し、フィールドベースの時刻値 (各フィールドを含む配列)
@@ -37,7 +37,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        Formatter リソース。
@@ -45,7 +45,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>value</parameter></term>
+     <term><parameter>string</parameter></term>
      <listitem>
       <para>
        時間に変換する文字列。
@@ -53,7 +53,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>position</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>
        $value のパースを開始する位置 (ゼロから数えます)。
@@ -61,7 +61,7 @@
        $parse_pos は -1 となります。それ以外の場合はパースが終了した位置となります
        (そしてエラーが発生します)。
        この変数には、パースが失敗した場合にその終了位置が含まれます。
-       $parse_pos > strlen($value) の場合、パースは即時に失敗します。
+       $parse_pos &gt; strlen($value) の場合、パースは即時に失敗します。
       </para>
      </listitem>
     </varlistentry>
@@ -75,6 +75,7 @@
   <para>
    Localtime 互換の、整数値の配列を返します。
    tm_hour フィールド内の、24 時間制の時刻の値を含みます。
+   &return.falseforfailure;
    </para>
  </refsect1>
  
@@ -151,7 +152,6 @@ tm_mday : 31 , tm_wday : 4 , tm_yday : 365 , tm_mon : 11 , tm_isdst : 0 ,
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/parse.xml b/reference/intl/dateformatter/parse.xml
index 2a2ebbac55..fc72ba63b9 100644
--- a/reference/intl/dateformatter/parse.xml
+++ b/reference/intl/dateformatter/parse.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 9643097fc3c3e26ba4545e77a150628b9b8e9230 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: ce46b05403346a4b21937db0b923173431104145 Maintainer: takagi Status: ready -->
 <refentry xml:id="intldateformatter.parse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>IntlDateFormatter::parse</refname>
@@ -12,22 +12,22 @@
   <para>
    &style.oop;
   </para>
-   <methodsynopsis>
-    <modifier>public</modifier> <type>int</type><methodname>IntlDateFormatter::parse</methodname>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter role="reference">position</parameter></methodparam>
-   </methodsynopsis>
+   <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>int</type><type>float</type><type>false</type></type><methodname>IntlDateFormatter::parse</methodname>
+   <methodparam><type>string</type><parameter>string</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter role="reference">offset</parameter><initializer>&null;</initializer></methodparam>
+  </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>int</type><methodname>datefmt_parse</methodname>
-  <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
-  <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  <methodparam choice="opt"><type>int</type><parameter role="reference">position</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>int</type><type>float</type><type>false</type></type><methodname>datefmt_parse</methodname>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
+   <methodparam><type>string</type><parameter>string</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter role="reference">offset</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
-   文字列 $value を時間に変換します。$parse_pos からパースを開始し、
+   <parameter>string</parameter> を時間に変換します。<parameter>offset</parameter> からパースを開始し、
    入力値を可能な限り使用します。
   </para> 
   </refsect1>
@@ -37,7 +37,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        Formatter リソース。
@@ -45,7 +45,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>value</parameter></term>
+     <term><parameter>string</parameter></term>
      <listitem>
       <para>
        時間に変換する文字列。
@@ -53,15 +53,15 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>position</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>
-       $value のパースを開始する位置 (ゼロから数えます)。
-       $value を処理する前にエラーが発生していない場合は
-       $parse_pos は -1 となります。それ以外の場合はパースが終了した位置となります
+       <parameter>string</parameter> のパースを開始する位置 (ゼロから数えます)。
+       <parameter>string</parameter> を処理する前にエラーが発生していない場合は
+       <parameter>offset</parameter> は -1 となります。それ以外の場合はパースが終了した位置となります
        (そしてエラーが発生します)。
        この変数には、パースが失敗した場合にその終了位置が含まれます。
-       $parse_pos > strlen($value) の場合、パースは即時に失敗します。
+       <parameter>offset</parameter> &gt; <code>strlen($string)</code> の場合、パースは即時に失敗します。
      </para>
      </listitem>
     </varlistentry>
@@ -140,7 +140,6 @@ Second parsed output is 630201600
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/set-calendar.xml b/reference/intl/dateformatter/set-calendar.xml
index 52b7798d49..ec10727d85 100644
--- a/reference/intl/dateformatter/set-calendar.xml
+++ b/reference/intl/dateformatter/set-calendar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 67923ad06fbfd6ad318662de2af936874dfd7bbd Maintainer: takagi Status: ready -->
+<!-- EN-Revision: ce46b05403346a4b21937db0b923173431104145 Maintainer: takagi Status: ready -->
 <!-- Credits: mumumu -->
 <refentry xml:id="intldateformatter.setcalendar" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -13,17 +13,17 @@
   <para>
    &style.oop;
   </para>
-   <methodsynopsis>
+   <methodsynopsis role="oop">
    <modifier>public</modifier> <type>bool</type><methodname>IntlDateFormatter::setCalendar</methodname>
-   <methodparam><type>mixed</type><parameter>which</parameter></methodparam>
-   </methodsynopsis>
+   <methodparam><type class="union"><type>IntlCalendar</type><type>int</type><type>null</type></type><parameter>calendar</parameter></methodparam>
+  </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
+  <methodsynopsis role="procedural">
    <type>bool</type><methodname>datefmt_set_calendar</methodname>
-  <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
-  <methodparam><type>mixed</type><parameter>which</parameter></methodparam>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
+   <methodparam><type class="union"><type>IntlCalendar</type><type>int</type><type>null</type></type><parameter>calendar</parameter></methodparam>
   </methodsynopsis>
   <para>
    このフォーマッターが使用するカレンダーあるいはカレンダー型を設定します。
@@ -35,7 +35,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        フォーマッターリソース。
@@ -43,7 +43,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>which</parameter></term>
+     <term><parameter>calendar</parameter></term>
      <listitem>
       <para>
        使用する <link
@@ -187,7 +187,6 @@ after:  Saturday, Rabiʻ II 20, 1434 at 7:00:00 PM Eastern Standard Time
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/set-lenient.xml b/reference/intl/dateformatter/set-lenient.xml
index 3147852771..8b7cdc94b4 100644
--- a/reference/intl/dateformatter/set-lenient.xml
+++ b/reference/intl/dateformatter/set-lenient.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 761cdaefbfbeb78e20c6ce5b6a333006496d18a4 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: ce46b05403346a4b21937db0b923173431104145 Maintainer: takagi Status: ready -->
 <refentry xml:id="intldateformatter.setlenient" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>IntlDateFormatter::setLenient</refname>
@@ -12,17 +12,17 @@
   <para>
    &style.oop;
   </para>
-   <methodsynopsis>
-    <modifier>public</modifier> <type>bool</type><methodname>IntlDateFormatter::setLenient</methodname>
-    <methodparam><type>bool</type><parameter>lenient</parameter></methodparam>
-   </methodsynopsis>
+   <methodsynopsis role="oop">
+   <modifier>public</modifier> <type>void</type><methodname>IntlDateFormatter::setLenient</methodname>
+   <methodparam><type>bool</type><parameter>lenient</parameter></methodparam>
+  </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>bool</type><methodname>datefmt_set_lenient</methodname>
-  <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
-  <methodparam><type>bool</type><parameter>lenient</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type>void</type><methodname>datefmt_set_lenient</methodname>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
+   <methodparam><type>bool</type><parameter>lenient</parameter></methodparam>
   </methodsynopsis>
   <para>
   パターンに正確にマッチしていない入力の処理を、
@@ -39,7 +39,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        Formatter リソース。
@@ -181,7 +181,6 @@ Error_code is : 9
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/set-pattern.xml b/reference/intl/dateformatter/set-pattern.xml
index b27b2914a3..198c7dd207 100644
--- a/reference/intl/dateformatter/set-pattern.xml
+++ b/reference/intl/dateformatter/set-pattern.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 9643097fc3c3e26ba4545e77a150628b9b8e9230 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: ce46b05403346a4b21937db0b923173431104145 Maintainer: takagi Status: ready -->
 <refentry xml:id="intldateformatter.setpattern" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>IntlDateFormatter::setPattern</refname>
@@ -12,17 +12,17 @@
   <para>
    &style.oop;
   </para>
-   <methodsynopsis>
-    <modifier>public</modifier> <type>bool</type><methodname>IntlDateFormatter::setPattern</methodname>
-    <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
-   </methodsynopsis>
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type>bool</type><methodname>IntlDateFormatter::setPattern</methodname>
+   <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
+  </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
+  <methodsynopsis role="procedural">
    <type>bool</type><methodname>datefmt_set_pattern</methodname>
-  <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
-  <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
+   <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
   </methodsynopsis>
   <para>
    IntlDateFormatter が使用するパターンを取得します。
@@ -34,7 +34,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        Formatter リソース。
@@ -132,7 +132,6 @@ Second Formatted output with pattern is 19690031 04:00:00 PST
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/settimezone.xml b/reference/intl/dateformatter/settimezone.xml
index 3c2ff97a47..421176cbb5 100644
--- a/reference/intl/dateformatter/settimezone.xml
+++ b/reference/intl/dateformatter/settimezone.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 19209bbc8e43b83524a2b3d76af0315c5d4271aa Maintainer: takagi Status: ready -->
+<!-- EN-Revision: ce46b05403346a4b21937db0b923173431104145 Maintainer: takagi Status: ready -->
 <!-- Credits: mumumu -->
 
 <refentry xml:id="intldateformatter.settimezone" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -15,20 +15,17 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
-   <modifier>public</modifier> 
-   <type>bool</type>
-   <methodname>IntlDateFormatter::setTimeZone</methodname>
-   <methodparam><type>mixed</type><parameter>zone</parameter></methodparam>
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>bool</type><type>null</type></type><methodname>IntlDateFormatter::setTimeZone</methodname>
+   <methodparam><type class="union"><type>IntlTimeZone</type><type>DateTimeZone</type><type>string</type><type>null</type></type><parameter>timezone</parameter></methodparam>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>bool</type>
-   <methodname>datefmt_set_timezone</methodname>
-   <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>zone</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>bool</type><type>null</type></type><methodname>datefmt_set_timezone</methodname>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
+   <methodparam><type class="union"><type>IntlTimeZone</type><type>DateTimeZone</type><type>string</type><type>null</type></type><parameter>timezone</parameter></methodparam>
   </methodsynopsis>
 
   <para>
@@ -41,7 +38,7 @@
   &reftitle.parameters;
   <variablelist>
    <varlistentry>
-    <term><parameter>fmt</parameter></term>
+    <term><parameter>formatter</parameter></term>
     <listitem>
      <para>
        フォーマッターのリソース
@@ -49,7 +46,7 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><parameter>zone</parameter></term>
+    <term><parameter>timezone</parameter></term>
     <listitem>
      <para>
       利用するタイムゾーン。次の形式で指定できます。
@@ -63,7 +60,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   成功した場合に &true;、失敗した場合に &false; を返します。
+   成功した場合に &null;、失敗した場合に &false; を返します。
   </para>
  </refsect1>
 
@@ -132,7 +129,6 @@ IntlTimeZone Object
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml