com doc/ja: Generate intl methodsynopses - Collator: reference/intl/collator.xml reference/intl/collator/asort.xml reference/intl/collator/compare.xml reference/intl/collator/create.xml reference/intl/collator/get-attribute.xml reference/intl/collator/get-error-code.xml reference/intl/collator/get-error-message.xml reference/intl/collator/get-locale.xml reference/intl/collator/get-sort-key.xml reference/intl/collator/get-strength.xml reference/in

diff --git a/reference/intl/collator.xml b/reference/intl/collator.xml
index 69d82cf1d7..7e6f628cad 100644
--- a/reference/intl/collator.xml
+++ b/reference/intl/collator.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 4724b47c25b48f509355d27291aa6893ad0b40c0 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 03841ffe3790dfcaef8d60decb6a011774df3727 Maintainer: takagi Status: ready -->
 
 <phpdoc:classref xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="class.collator" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>Collator クラス</title>
@@ -47,9 +47,9 @@
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include
-     xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.collator')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[1])" />
+     xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.collator')/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.collator')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+     xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.collator')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
    </classsynopsis>
    <!-- }}} -->
 
diff --git a/reference/intl/collator/asort.xml b/reference/intl/collator/asort.xml
index a8524928dc..e4378c6b5d 100644
--- a/reference/intl/collator/asort.xml
+++ b/reference/intl/collator/asort.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 656d1610af1a960d87c8b7056e54d0d4c75fb123 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 03841ffe3790dfcaef8d60decb6a011774df3727 Maintainer: takagi Status: ready -->
 <refentry xml:id="collator.asort" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Collator::asort</refname>
@@ -11,22 +11,19 @@
  <refsect1 role="description">
   &reftitle.description;
   <para>&style.oop;</para>
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>Collator::asort</methodname>
-   <methodparam><type>array</type><parameter role="reference">arr</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>sort_flag</parameter></methodparam>
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type>bool</type><methodname>Collator::asort</methodname>
+   <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>Collator::SORT_REGULAR</initializer></methodparam>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>bool</type>
-   <methodname>collator_asort</methodname>
-   <methodparam><type>Collator</type><parameter>coll</parameter></methodparam>
-   <methodparam><type>array</type><parameter role="reference">arr</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>sort_flag</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type>bool</type><methodname>collator_asort</methodname>
+   <methodparam><type>Collator</type><parameter>object</parameter></methodparam>
+   <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>Collator::SORT_REGULAR</initializer></methodparam>
   </methodsynopsis>
   <para>
    この関数は、インデックスと値の関係を保持したうえで配列を並べ替えます。
@@ -44,7 +41,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>coll</parameter></term>
+     <term><parameter>object</parameter></term>
      <listitem>
       <para>
        <classname>Collator</classname> オブジェクト。
@@ -52,13 +49,13 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>arr</parameter></term>
+     <term><parameter>array</parameter></term>
      <listitem>
       <para>並べ替えたい文字列の配列。</para>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>sort_flag</parameter></term>
+     <term><parameter>flags</parameter></term>
      <listitem>
       <para>
        オプションの並べ替え方式。以下のいずれか。
@@ -153,7 +150,6 @@ array (
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
  Local variables:
  mode: sgml
diff --git a/reference/intl/collator/compare.xml b/reference/intl/collator/compare.xml
index d1d72df020..f21d9440f2 100644
--- a/reference/intl/collator/compare.xml
+++ b/reference/intl/collator/compare.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 03841ffe3790dfcaef8d60decb6a011774df3727 Maintainer: takagi Status: ready -->
 <refentry xml:id="collator.compare" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Collator::compare</refname>
@@ -13,22 +13,19 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>int</type>
-   <methodname>Collator::compare</methodname>
-   <methodparam><type>string</type><parameter>str1</parameter></methodparam>
-   <methodparam><type>string</type><parameter>str2</parameter></methodparam>
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>int</type><type>false</type></type><methodname>Collator::compare</methodname>
+   <methodparam><type>string</type><parameter>string1</parameter></methodparam>
+   <methodparam><type>string</type><parameter>string2</parameter></methodparam>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>int</type>
-   <methodname>collator_compare</methodname>
-   <methodparam><type>Collator</type><parameter>coll</parameter></methodparam>
-   <methodparam><type>string</type><parameter>str1</parameter></methodparam>
-   <methodparam><type>string</type><parameter>str2</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>int</type><type>false</type></type><methodname>collator_compare</methodname>
+   <methodparam><type>Collator</type><parameter>object</parameter></methodparam>
+   <methodparam><type>string</type><parameter>string1</parameter></methodparam>
+   <methodparam><type>string</type><parameter>string2</parameter></methodparam>
   </methodsynopsis>
   <para>
    ふたつの Unicode 文字列を、比較規則にもとづいて比較します。
@@ -40,7 +37,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>coll</parameter></term>
+     <term><parameter>object</parameter></term>
      <listitem>
       <para>
        <classname>Collator</classname> オブジェクト。
@@ -48,7 +45,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>str1</parameter></term>
+     <term><parameter>string1</parameter></term>
      <listitem>
       <para>
        最初の文字列。
@@ -56,7 +53,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>str2</parameter></term>
+     <term><parameter>string2</parameter></term>
      <listitem>
       <para>
        2 番目の文字列。
@@ -74,19 +71,19 @@
    <itemizedlist>
     <listitem>
      <para>
-      <parameter>str1</parameter> が <parameter>str2</parameter> より
+      <parameter>string1</parameter> が <parameter>string2</parameter> より
       <emphasis>大きい</emphasis> ときは 1
      </para>
     </listitem>
     <listitem>
      <para>
-      <parameter>str1</parameter> と <parameter>str2</parameter> が
+      <parameter>string1</parameter> と <parameter>string2</parameter> が
       <emphasis>等しい</emphasis> ときは 0
      </para>
     </listitem>
     <listitem>
      <para>
-      <parameter>str1</parameter> が <parameter>str2</parameter> より
+      <parameter>string1</parameter> が <parameter>string2</parameter> より
       <emphasis>小さい</emphasis> ときは -1
      </para>
     </listitem>
@@ -142,7 +139,6 @@ if ($res === false) {
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
  Local variables:
  mode: sgml
diff --git a/reference/intl/collator/create.xml b/reference/intl/collator/create.xml
index 6df01bb798..09522dee44 100644
--- a/reference/intl/collator/create.xml
+++ b/reference/intl/collator/create.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 03841ffe3790dfcaef8d60decb6a011774df3727 Maintainer: takagi Status: ready -->
 <refentry xml:id="collator.create" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Collator::create</refname>
@@ -11,19 +11,15 @@
  <refsect1 role="description">
   &reftitle.description;
   <para>&style.oop;</para>
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>Collator</type>
-   <methodname>Collator::create</methodname>
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>Collator</type><type>null</type></type><methodname>Collator::create</methodname>
    <methodparam><type>string</type><parameter>locale</parameter></methodparam>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>Collator</type>
-   <methodname>collator_create</methodname>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>Collator</type><type>null</type></type><methodname>collator_create</methodname>
    <methodparam><type>string</type><parameter>locale</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -88,7 +84,6 @@ if( !isset( $coll ) ) {
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
  Local variables:
  mode: sgml
diff --git a/reference/intl/collator/get-attribute.xml b/reference/intl/collator/get-attribute.xml
index 00cda20c3b..d2ade40668 100644
--- a/reference/intl/collator/get-attribute.xml
+++ b/reference/intl/collator/get-attribute.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 03841ffe3790dfcaef8d60decb6a011774df3727 Maintainer: takagi Status: ready -->
 <refentry xml:id="collator.getattribute" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Collator::getAttribute</refname>
@@ -13,20 +13,17 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>int</type>
-   <methodname>Collator::getAttribute</methodname>
-   <methodparam><type>int</type><parameter>attr</parameter></methodparam>
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>int</type><type>false</type></type><methodname>Collator::getAttribute</methodname>
+   <methodparam><type>int</type><parameter>attribute</parameter></methodparam>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>int</type>
-   <methodname>collator_get_attribute</methodname>
-   <methodparam><type>Collator</type><parameter>coll</parameter></methodparam>
-   <methodparam><type>int</type><parameter>attr</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>int</type><type>false</type></type><methodname>collator_get_attribute</methodname>
+   <methodparam><type>Collator</type><parameter>object</parameter></methodparam>
+   <methodparam><type>int</type><parameter>attribute</parameter></methodparam>
   </methodsynopsis>
   <para>
    collator の属性の値を取得します。
@@ -38,7 +35,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>coll</parameter></term>
+     <term><parameter>object</parameter></term>
      <listitem>
       <para>
        <classname>Collator</classname> オブジェクト。
@@ -46,7 +43,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>attr</parameter></term>
+     <term><parameter>attribute</parameter></term>
      <listitem>
       <para>
        値を取得したい属性。
@@ -97,7 +94,6 @@ if( $val === false )
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
  Local variables:
  mode: sgml
diff --git a/reference/intl/collator/get-error-code.xml b/reference/intl/collator/get-error-code.xml
index 9fe1fcd2d9..9dcf8a59e6 100644
--- a/reference/intl/collator/get-error-code.xml
+++ b/reference/intl/collator/get-error-code.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 656d1610af1a960d87c8b7056e54d0d4c75fb123 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 03841ffe3790dfcaef8d60decb6a011774df3727 Maintainer: takagi Status: ready -->
 <refentry xml:id="collator.geterrorcode" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Collator::getErrorCode</refname>
@@ -13,19 +13,16 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>int</type>
-   <methodname>Collator::getErrorCode</methodname>
-   <void />
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>int</type><type>false</type></type><methodname>Collator::getErrorCode</methodname>
+   <void/>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>int</type>
-   <methodname>collator_get_error_code</methodname>
-   <methodparam><type>Collator</type><parameter>coll</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>int</type><type>false</type></type><methodname>collator_get_error_code</methodname>
+   <methodparam><type>Collator</type><parameter>object</parameter></methodparam>
   </methodsynopsis>
   <para>
    <!-- description goes here -->
@@ -37,7 +34,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>coll</parameter></term>
+     <term><parameter>object</parameter></term>
      <listitem>
       <para>
        <classname>Collator</classname> オブジェクト。
@@ -53,6 +50,7 @@
   &reftitle.returnvalues;
   <para>
    直近の Collator <acronym>API</acronym> 関数コールが返したエラーコードを返します。
+   &return.falseforfailure;
   </para>
  </refsect1>
 
@@ -83,7 +81,6 @@ if( collator_get_attribute( $coll, Collator::FRENCH_COLLATION ) === false )
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
  Local variables:
  mode: sgml
diff --git a/reference/intl/collator/get-error-message.xml b/reference/intl/collator/get-error-message.xml
index 2a92584b43..d9fec35885 100644
--- a/reference/intl/collator/get-error-message.xml
+++ b/reference/intl/collator/get-error-message.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 656d1610af1a960d87c8b7056e54d0d4c75fb123 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 03841ffe3790dfcaef8d60decb6a011774df3727 Maintainer: takagi Status: ready -->
 <refentry xml:id="collator.geterrormessage" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Collator::getErrorMessage</refname>
@@ -13,19 +13,16 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>string</type>
-   <methodname>Collator::getErrorMessage</methodname>
-   <void />
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>Collator::getErrorMessage</methodname>
+   <void/>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>string</type>
-   <methodname>collator_get_error_message</methodname>
-   <methodparam><type>Collator</type><parameter>coll</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>string</type><type>false</type></type><methodname>collator_get_error_message</methodname>
+   <methodparam><type>Collator</type><parameter>object</parameter></methodparam>
   </methodsynopsis>
   <para>
    直近のエラーのメッセージを取得します。
@@ -37,7 +34,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>coll</parameter></term>
+     <term><parameter>object</parameter></term>
      <listitem>
       <para>
        <classname>Collator</classname> オブジェクト。
@@ -53,6 +50,7 @@
   &reftitle.returnvalues;
   <para>
    直近の Collator <acronym>API</acronym> 関数コールで発生したエラーの説明を返します。
+   &return.falseforfailure;
   </para>
  </refsect1>
 
@@ -84,7 +82,6 @@ if( collator_compare( $coll, 'y', 'k' ) === false ) {
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
  Local variables:
  mode: sgml
diff --git a/reference/intl/collator/get-locale.xml b/reference/intl/collator/get-locale.xml
index d18957fbd2..e71a20b5eb 100644
--- a/reference/intl/collator/get-locale.xml
+++ b/reference/intl/collator/get-locale.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 86e6094e86b84a51d00ab217ac50ce8dde33d82a Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 03841ffe3790dfcaef8d60decb6a011774df3727 Maintainer: takagi Status: ready -->
 <refentry xml:id="collator.getlocale" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Collator::getLocale</refname>
@@ -13,19 +13,16 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>string</type>
-   <methodname>Collator::getLocale</methodname>
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>Collator::getLocale</methodname>
    <methodparam><type>int</type><parameter>type</parameter></methodparam>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>string</type>
-   <methodname>collator_get_locale</methodname>
-   <methodparam><type>Collator</type><parameter>coll</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>string</type><type>false</type></type><methodname>collator_get_locale</methodname>
+   <methodparam><type>Collator</type><parameter>object</parameter></methodparam>
    <methodparam><type>int</type><parameter>type</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -38,7 +35,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>coll</parameter></term>
+     <term><parameter>object</parameter></term>
      <listitem>
       <para>
        <classname>Collator</classname> オブジェクト。
@@ -106,7 +103,6 @@ Actual locale name: en
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
  Local variables:
  mode: sgml
diff --git a/reference/intl/collator/get-sort-key.xml b/reference/intl/collator/get-sort-key.xml
index 405098aa5c..0e84893fdf 100644
--- a/reference/intl/collator/get-sort-key.xml
+++ b/reference/intl/collator/get-sort-key.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: b95d28e6ec86e4a71e012737d36ebdc1cf009180 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 03841ffe3790dfcaef8d60decb6a011774df3727 Maintainer: takagi Status: ready -->
 <!-- Credits: mumumu -->
 <refentry xml:id="collator.getsortkey" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -14,20 +14,17 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type class="union"><type>string</type><type>false</type></type>
-   <methodname>Collator::getSortKey</methodname>
-   <methodparam><type>string</type><parameter>str</parameter></methodparam>
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>Collator::getSortKey</methodname>
+   <methodparam><type>string</type><parameter>string</parameter></methodparam>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type>
-   <methodname>collator_get_sort_key</methodname>
-   <methodparam><type>Collator</type><parameter>coll</parameter></methodparam>
-   <methodparam><type>string</type><parameter>str</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>string</type><type>false</type></type><methodname>collator_get_sort_key</methodname>
+   <methodparam><type>Collator</type><parameter>object</parameter></methodparam>
+   <methodparam><type>string</type><parameter>string</parameter></methodparam>
   </methodsynopsis>
   <para>
    文字列用の照合キーを返します。
@@ -42,7 +39,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>coll</parameter></term>
+     <term><parameter>object</parameter></term>
      <listitem>
       <para>
        <classname>Collator</classname> オブジェクト。
@@ -50,7 +47,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>str</parameter></term>
+     <term><parameter>string</parameter></term>
      <listitem>
       <para>
        キーの生成元となる文字列。
@@ -124,7 +121,6 @@ echo bin2hex($res);
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
  Local variables:
  mode: sgml
diff --git a/reference/intl/collator/get-strength.xml b/reference/intl/collator/get-strength.xml
index 792b6f7fe2..c9a2bd0fc5 100644
--- a/reference/intl/collator/get-strength.xml
+++ b/reference/intl/collator/get-strength.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 03841ffe3790dfcaef8d60decb6a011774df3727 Maintainer: takagi Status: ready -->
 <refentry xml:id="collator.getstrength" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Collator::getStrength</refname>
@@ -13,19 +13,16 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>int</type>
-   <methodname>Collator::getStrength</methodname>
-   <void />
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type>int</type><methodname>Collator::getStrength</methodname>
+   <void/>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>int</type>
-   <methodname>collator_get_strength</methodname>
-   <methodparam><type>Collator</type><parameter>coll</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type>int</type><methodname>collator_get_strength</methodname>
+   <methodparam><type>Collator</type><parameter>object</parameter></methodparam>
   </methodsynopsis>
   <para>
    <!-- description goes here -->
@@ -37,7 +34,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>coll</parameter></term>
+     <term><parameter>object</parameter></term>
      <listitem>
       <para>
        <classname>Collator</classname> オブジェクト。
@@ -92,7 +89,6 @@ $strength = collator_get_strength( $coll );
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
  Local variables:
  mode: sgml
diff --git a/reference/intl/collator/set-attribute.xml b/reference/intl/collator/set-attribute.xml
index d0d7dd4390..a58d428c57 100644
--- a/reference/intl/collator/set-attribute.xml
+++ b/reference/intl/collator/set-attribute.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 656d1610af1a960d87c8b7056e54d0d4c75fb123 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 03841ffe3790dfcaef8d60decb6a011774df3727 Maintainer: takagi Status: ready -->
 <refentry xml:id="collator.setattribute" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Collator::setAttribute</refname>
@@ -13,22 +13,19 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>Collator::setAttribute</methodname>
-   <methodparam><type>int</type><parameter>attr</parameter></methodparam>
-   <methodparam><type>int</type><parameter>val</parameter></methodparam>
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type>bool</type><methodname>Collator::setAttribute</methodname>
+   <methodparam><type>int</type><parameter>attribute</parameter></methodparam>
+   <methodparam><type>int</type><parameter>value</parameter></methodparam>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>bool</type>
-   <methodname>collator_set_attribute</methodname>
-   <methodparam><type>Collator</type><parameter>coll</parameter></methodparam>
-   <methodparam><type>int</type><parameter>attr</parameter></methodparam>
-   <methodparam><type>int</type><parameter>val</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type>bool</type><methodname>collator_set_attribute</methodname>
+   <methodparam><type>Collator</type><parameter>object</parameter></methodparam>
+   <methodparam><type>int</type><parameter>attribute</parameter></methodparam>
+   <methodparam><type>int</type><parameter>value</parameter></methodparam>
   </methodsynopsis>
   <para>
    <!-- description goes here -->
@@ -40,7 +37,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>coll</parameter></term>
+     <term><parameter>object</parameter></term>
      <listitem>
       <para>
        <classname>Collator</classname> オブジェクト。
@@ -48,13 +45,13 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>attr</parameter></term>
+     <term><parameter>attribute</parameter></term>
      <listitem>
       <para>属性。</para>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>val</parameter></term>
+     <term><parameter>value</parameter></term>
      <listitem>
       <para>
        属性の値。
@@ -105,7 +102,6 @@ if ($val === false) {
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
  Local variables:
  mode: sgml
diff --git a/reference/intl/collator/set-strength.xml b/reference/intl/collator/set-strength.xml
index 4ca158d397..b45701421e 100644
--- a/reference/intl/collator/set-strength.xml
+++ b/reference/intl/collator/set-strength.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: f9c53ddae5b2c5e2bd0f2f6538196429901237b5 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 03841ffe3790dfcaef8d60decb6a011774df3727 Maintainer: takagi Status: ready -->
 <refentry xml:id="collator.setstrength" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Collator::setStrength</refname>
@@ -13,19 +13,16 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>Collator::setStrength</methodname>
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type>bool</type><methodname>Collator::setStrength</methodname>
    <methodparam><type>int</type><parameter>strength</parameter></methodparam>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>bool</type>
-   <methodname>collator_set_strength</methodname>
-   <methodparam><type>Collator</type><parameter>coll</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type>bool</type><methodname>collator_set_strength</methodname>
+   <methodparam><type>Collator</type><parameter>object</parameter></methodparam>
    <methodparam><type>int</type><parameter>strength</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -132,7 +129,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>coll</parameter></term>
+     <term><parameter>object</parameter></term>
      <listitem>
       <para>
        <classname>Collator</classname> オブジェクト。
@@ -242,7 +239,6 @@ array (
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
  Local variables:
  mode: sgml
diff --git a/reference/intl/collator/sort-with-sort-keys.xml b/reference/intl/collator/sort-with-sort-keys.xml
index 856d53fa54..62dab52970 100644
--- a/reference/intl/collator/sort-with-sort-keys.xml
+++ b/reference/intl/collator/sort-with-sort-keys.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 656d1610af1a960d87c8b7056e54d0d4c75fb123 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 03841ffe3790dfcaef8d60decb6a011774df3727 Maintainer: takagi Status: ready -->
 <refentry xml:id="collator.sortwithsortkeys" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Collator::sortWithSortKeys</refname>
@@ -13,20 +13,17 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>Collator::sortWithSortKeys</methodname>
-   <methodparam><type>array</type><parameter role="reference">arr</parameter></methodparam>
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type>bool</type><methodname>Collator::sortWithSortKeys</methodname>
+   <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>bool</type>
-   <methodname>collator_sort_with_sort_keys</methodname>
-   <methodparam><type>Collator</type><parameter>coll</parameter></methodparam>
-   <methodparam><type>array</type><parameter role="reference">arr</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type>bool</type><methodname>collator_sort_with_sort_keys</methodname>
+   <methodparam><type>Collator</type><parameter>object</parameter></methodparam>
+   <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>collator_sort</function> と似ていますが、
@@ -40,7 +37,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>coll</parameter></term>
+     <term><parameter>object</parameter></term>
      <listitem>
       <para>
        <classname>Collator</classname> オブジェクト。
@@ -48,7 +45,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>arr</parameter></term>
+     <term><parameter>array</parameter></term>
      <listitem>
       <para>並べ替えたい文字列の配列。</para>
      </listitem>
@@ -105,7 +102,6 @@ array (
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
  Local variables:
  mode: sgml
diff --git a/reference/intl/collator/sort.xml b/reference/intl/collator/sort.xml
index b29b0435d6..b1eb07bf45 100644
--- a/reference/intl/collator/sort.xml
+++ b/reference/intl/collator/sort.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 656d1610af1a960d87c8b7056e54d0d4c75fb123 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 03841ffe3790dfcaef8d60decb6a011774df3727 Maintainer: takagi Status: ready -->
 <refentry xml:id="collator.sort" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Collator::sort</refname>
@@ -13,22 +13,19 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>Collator::sort</methodname>
-   <methodparam><type>array</type><parameter role="reference">arr</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>sort_flag</parameter></methodparam>
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type>bool</type><methodname>Collator::sort</methodname>
+   <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>Collator::SORT_REGULAR</initializer></methodparam>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>bool</type>
-   <methodname>collator_sort</methodname>
-   <methodparam><type>Collator</type><parameter>coll</parameter></methodparam>
-   <methodparam><type>array</type><parameter role="reference">arr</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>sort_flag</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type>bool</type><methodname>collator_sort</methodname>
+   <methodparam><type>Collator</type><parameter>object</parameter></methodparam>
+   <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>Collator::SORT_REGULAR</initializer></methodparam>
   </methodsynopsis>
   <para>この関数は、現在のロケールの規則にもとづいて配列を並べ替えます。</para>
   <para>
@@ -42,7 +39,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>coll</parameter></term>
+     <term><parameter>object</parameter></term>
      <listitem>
       <para>
        <classname>Collator</classname> オブジェクト。
@@ -50,7 +47,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>arr</parameter></term>
+     <term><parameter>array</parameter></term>
      <listitem>
       <para>
        並べ替えたい文字列の配列。
@@ -58,7 +55,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>sort_flag</parameter></term>
+     <term><parameter>flags</parameter></term>
      <listitem>
       <para>
        オプションの並べ替え方式。以下のいずれか。
@@ -85,7 +82,7 @@
         </listitem>
        </itemizedlist>
        デフォルトの並べ替え方式は <constant>Collator::SORT_REGULAR</constant>
-       です。<parameter>sort_flag</parameter> に無効な値を指定した場合もこの方式を使います。
+       です。<parameter>flags</parameter> に無効な値を指定した場合もこの方式を使います。
       </para>
      </listitem>
     </varlistentry>
@@ -147,7 +144,6 @@ array (
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
  Local variables:
  mode: sgml