com doc/ja: Generate intl methodsynopses based on stubs - Grapheme, IDN: reference/intl/grapheme/grapheme-extract.xml reference/intl/grapheme/grapheme-stripos.xml reference/intl/grapheme/grapheme-stristr.xml reference/intl/grapheme/grapheme-strlen.xml reference/intl/grapheme/grapheme-strpos.xml reference/intl/grapheme/grapheme-strripos.xml reference/intl/grapheme/grapheme-strrpos.xml reference/intl/grapheme/grapheme-strstr.xml reference/intl/grap

diff --git a/reference/intl/grapheme/grapheme-extract.xml b/reference/intl/grapheme/grapheme-extract.xml
index 65f654e76b..da12b580d4 100644
--- a/reference/intl/grapheme/grapheme-extract.xml
+++ b/reference/intl/grapheme/grapheme-extract.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: dd07341fae2c414adc1f700be0890ff32e8daab4 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: b548fc8e5592b577d29aabf9cf2e79d5385ae549 Maintainer: takagi Status: ready -->
 <refentry xml:id="function.grapheme-extract" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>grapheme_extract</refname>
@@ -11,12 +11,12 @@
   &reftitle.description;
   <para>&style.procedural;</para>
   <methodsynopsis>
-   <type>string</type><methodname>grapheme_extract</methodname>
+   <type class="union"><type>string</type><type>false</type></type><methodname>grapheme_extract</methodname>
    <methodparam><type>string</type><parameter>haystack</parameter></methodparam>
    <methodparam><type>int</type><parameter>size</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>extract_type</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>start</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter role="reference">next</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer><constant>GRAPHEME_EXTR_COUNT</constant></initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter role="reference">next</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    デフォルトの書記素クラスタシーケンスをテキストバッファから取り出す関数です。
@@ -45,7 +45,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>extract_type</parameter></term>
+     <term><parameter>type</parameter></term>
      <listitem>
       <para>
        $size パラメータの単位の形式を指定します。
@@ -61,7 +61,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>start</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>
        $haystack 内での開始位置をバイト数で指定します。
@@ -93,6 +93,7 @@
    オフセット $start から始まり、
    指定した $size と $extract_type を満たす、
    デフォルトの書記素クラスタバウンダリで終わる文字列を返します。
+   &return.falseforfailure;
   </para>
  </refsect1>
  
@@ -110,7 +111,7 @@
      <row>
       <entry>7.1.0</entry>
       <entry>
-       負の <parameter>start</parameter> をサポートするようになりました。
+       負の <parameter>offset</parameter> をサポートするようになりました。
       </entry>
      </row>
     </tbody>
@@ -157,7 +158,6 @@ o%CC%88
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/grapheme/grapheme-stripos.xml b/reference/intl/grapheme/grapheme-stripos.xml
index 82395bdd03..92a11cf9f2 100644
--- a/reference/intl/grapheme/grapheme-stripos.xml
+++ b/reference/intl/grapheme/grapheme-stripos.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: d225d8999548421ae145c612f14c683a41e543f9 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: b548fc8e5592b577d29aabf9cf2e79d5385ae549 Maintainer: takagi Status: ready -->
 <refentry xml:id="function.grapheme-stripos" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>grapheme_stripos</refname>
@@ -10,7 +10,7 @@
   &reftitle.description;
   <para>&style.procedural;</para>
   <methodsynopsis>
-   <type>int</type><methodname>grapheme_stripos</methodname>
+   <type class="union"><type>int</type><type>false</type></type><methodname>grapheme_stripos</methodname>
    <methodparam><type>string</type><parameter>haystack</parameter></methodparam>
    <methodparam><type>string</type><parameter>needle</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>0</initializer></methodparam>
@@ -61,7 +61,7 @@
   &reftitle.returnvalues;
   <para>
    位置を表す整数値を返します。needle が見つからない場合は
-   grapheme_stripos() は FALSE を返します。
+   grapheme_stripos() は &false; を返します。
   </para>
  </refsect1>
  
@@ -131,7 +131,6 @@ print grapheme_stripos( $char_a_ring_nfd . $char_a_ring_nfd . $char_o_diaeresis_
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/grapheme/grapheme-stristr.xml b/reference/intl/grapheme/grapheme-stristr.xml
index adbf795fc7..2470940c76 100644
--- a/reference/intl/grapheme/grapheme-stristr.xml
+++ b/reference/intl/grapheme/grapheme-stristr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: b8758b0605e80c4e3610137b7502a6abeea5c69b Maintainer: takagi Status: ready -->
+<!-- EN-Revision: b548fc8e5592b577d29aabf9cf2e79d5385ae549 Maintainer: takagi Status: ready -->
 <refentry xml:id="function.grapheme-stristr" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>grapheme_stristr</refname>
@@ -10,10 +10,10 @@
   &reftitle.description;
   <para>&style.procedural;</para>
   <methodsynopsis>
-   <type>string</type><methodname>grapheme_stristr</methodname>
+   <type class="union"><type>string</type><type>false</type></type><methodname>grapheme_stristr</methodname>
    <methodparam><type>string</type><parameter>haystack</parameter></methodparam>
    <methodparam><type>string</type><parameter>needle</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>before_needle</parameter><initializer>&false;</initializer></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>beforeNeedle</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
   <para>
    大文字小文字を区別せず、haystack 文字列の中で needle が最初に登場した場所を含めてそれ以降の部分文字列を返します。
@@ -41,7 +41,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>before_needle</parameter></term>
+     <term><parameter>beforeNeedle</parameter></term>
      <listitem>
       <para>
        &true; の場合、grapheme_strstr()
@@ -57,7 +57,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   $haystack の部分文字列、あるいは $needle が見つからなかった場合に FALSE を返します。
+   $haystack の部分文字列、あるいは $needle が見つからなかった場合に &false; を返します。
   </para>
  </refsect1>
  
@@ -105,7 +105,6 @@ o%CC%88a%CC%8A
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/grapheme/grapheme-strlen.xml b/reference/intl/grapheme/grapheme-strlen.xml
index 79df212a5f..dc740d090e 100644
--- a/reference/intl/grapheme/grapheme-strlen.xml
+++ b/reference/intl/grapheme/grapheme-strlen.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 54d64fe32af4f232dc67fa0b07f295a801156d04 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: b548fc8e5592b577d29aabf9cf2e79d5385ae549 Maintainer: takagi Status: ready -->
 <refentry xml:id="function.grapheme-strlen" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>grapheme_strlen</refname>
@@ -10,8 +10,8 @@
   &reftitle.description;
   <para>&style.procedural;</para>
   <methodsynopsis>
-   <type>int</type><methodname>grapheme_strlen</methodname>
-   <methodparam><type>string</type><parameter>input</parameter></methodparam>
+   <type class="union"><type>int</type><type>false</type><type>null</type></type><methodname>grapheme_strlen</methodname>
+   <methodparam><type>string</type><parameter>string</parameter></methodparam>
   </methodsynopsis>
   <para>
    書記素単位 (バイト数や文字数ではありません) で文字列の長さを取得します。
@@ -23,7 +23,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>input</parameter></term>
+     <term><parameter>string</parameter></term>
      <listitem>
       <para>
        長さを調べたい文字列。正しい形式の UTF-8 でなければなりません。
@@ -38,7 +38,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   成功した場合に文字列の長さ。文字列が空の場合に 0 を返します。
+   成功した場合に文字列の長さを返します。
+   &return.falseforfailure;
   </para>
  </refsect1>
  
@@ -83,7 +84,6 @@ print grapheme_strlen( 'abc' . $char_a_ring_nfd . $char_o_diaeresis_nfd . $char_
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/grapheme/grapheme-strpos.xml b/reference/intl/grapheme/grapheme-strpos.xml
index 326822dcd0..ecfa78147b 100644
--- a/reference/intl/grapheme/grapheme-strpos.xml
+++ b/reference/intl/grapheme/grapheme-strpos.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: d225d8999548421ae145c612f14c683a41e543f9 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: b548fc8e5592b577d29aabf9cf2e79d5385ae549 Maintainer: takagi Status: ready -->
 <refentry xml:id="function.grapheme-strpos" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>grapheme_strpos</refname>
@@ -10,7 +10,7 @@
   &reftitle.description;
   <para>&style.procedural;</para>
   <methodsynopsis>
-   <type>int</type><methodname>grapheme_strpos</methodname>
+   <type class="union"><type>int</type><type>false</type></type><methodname>grapheme_strpos</methodname>
    <methodparam><type>string</type><parameter>haystack</parameter></methodparam>
    <methodparam><type>string</type><parameter>needle</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>0</initializer></methodparam>
@@ -61,7 +61,7 @@
   &reftitle.returnvalues;
   <para>
    位置を表す整数値を返します。needle が見つからない場合は
-   grapheme_strpos() は FALSE を返します。
+   grapheme_strpos() は &false; を返します。
   </para>
  </refsect1>
  
@@ -130,7 +130,6 @@ print grapheme_strpos( $char_a_ring_nfd . $char_a_ring_nfd . $char_o_diaeresis_n
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/grapheme/grapheme-strripos.xml b/reference/intl/grapheme/grapheme-strripos.xml
index 06a122f1c8..d07b2957c7 100644
--- a/reference/intl/grapheme/grapheme-strripos.xml
+++ b/reference/intl/grapheme/grapheme-strripos.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 6a6061bbd4b1c78af2b50aba8ddd8fd5e4590b05 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: b548fc8e5592b577d29aabf9cf2e79d5385ae549 Maintainer: takagi Status: ready -->
 <refentry xml:id="function.grapheme-strripos" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>grapheme_strripos</refname>
@@ -10,7 +10,7 @@
   &reftitle.description;
   <para>&style.procedural;</para>
   <methodsynopsis>
-   <type>int</type><methodname>grapheme_strripos</methodname>
+   <type class="union"><type>int</type><type>false</type></type><methodname>grapheme_strripos</methodname>
    <methodparam><type>string</type><parameter>haystack</parameter></methodparam>
    <methodparam><type>string</type><parameter>needle</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>0</initializer></methodparam>
@@ -60,7 +60,7 @@
   &reftitle.returnvalues;
   <para>
    位置を表す整数値を返します。needle が見つからない場合は
-   grapheme_strripos() は FALSE を返します。
+   grapheme_strripos() は &false; を返します。
   </para>
  </refsect1>
  
@@ -108,7 +108,6 @@ print grapheme_strripos( $char_a_ring_nfd . $char_o_diaeresis_nfd . $char_o_diae
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/grapheme/grapheme-strrpos.xml b/reference/intl/grapheme/grapheme-strrpos.xml
index 91b1571998..7086ac1fbb 100644
--- a/reference/intl/grapheme/grapheme-strrpos.xml
+++ b/reference/intl/grapheme/grapheme-strrpos.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 6a6061bbd4b1c78af2b50aba8ddd8fd5e4590b05 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: b548fc8e5592b577d29aabf9cf2e79d5385ae549 Maintainer: takagi Status: ready -->
 <refentry xml:id="function.grapheme-strrpos" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>grapheme_strrpos</refname>
@@ -10,7 +10,7 @@
   &reftitle.description;
   <para>&style.procedural;</para>
   <methodsynopsis>
-   <type>int</type><methodname>grapheme_strrpos</methodname>
+   <type class="union"><type>int</type><type>false</type></type><methodname>grapheme_strrpos</methodname>
    <methodparam><type>string</type><parameter>haystack</parameter></methodparam>
    <methodparam><type>string</type><parameter>needle</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>0</initializer></methodparam>
@@ -60,7 +60,7 @@
   &reftitle.returnvalues;
   <para>
    位置を表す整数値を返します。needle が見つからない場合は
-   grapheme_strrpos() は FALSE を返します。
+   grapheme_strrpos() は &false; を返します。
   </para>
  </refsect1>
  
@@ -105,7 +105,6 @@ print grapheme_strrpos( $char_a_ring_nfd . $char_o_diaeresis_nfd . $char_o_diaer
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/grapheme/grapheme-strstr.xml b/reference/intl/grapheme/grapheme-strstr.xml
index 9039f0a4a3..3786394636 100644
--- a/reference/intl/grapheme/grapheme-strstr.xml
+++ b/reference/intl/grapheme/grapheme-strstr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: b8758b0605e80c4e3610137b7502a6abeea5c69b Maintainer: takagi Status: ready -->
+<!-- EN-Revision: b548fc8e5592b577d29aabf9cf2e79d5385ae549 Maintainer: takagi Status: ready -->
 <refentry xml:id="function.grapheme-strstr" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>grapheme_strstr</refname>
@@ -10,10 +10,10 @@
   &reftitle.description;
   <para>&style.procedural;</para>
   <methodsynopsis>
-   <type>string</type><methodname>grapheme_strstr</methodname>
+   <type class="union"><type>string</type><type>false</type></type><methodname>grapheme_strstr</methodname>
    <methodparam><type>string</type><parameter>haystack</parameter></methodparam>
    <methodparam><type>string</type><parameter>needle</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>before_needle</parameter><initializer>&false;</initializer></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>beforeNeedle</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
   <para>
    haystack 文字列の中で needle が最初に登場した場所を含めてそれ以降の部分文字列を返します。
@@ -41,7 +41,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>before_needle</parameter></term>
+     <term><parameter>beforeNeedle</parameter></term>
      <listitem>
       <para>
        &true; の場合、grapheme_strstr()
@@ -57,7 +57,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   部分文字列、あるいは needle が見つからなかった場合に FALSE を返します。
+   部分文字列、あるいは needle が見つからなかった場合に &false; を返します。
   </para>
  </refsect1>
  
@@ -104,7 +104,6 @@ o%CC%88a%CC%8A
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/grapheme/grapheme-substr.xml b/reference/intl/grapheme/grapheme-substr.xml
index 62a480a265..99d76c50d0 100644
--- a/reference/intl/grapheme/grapheme-substr.xml
+++ b/reference/intl/grapheme/grapheme-substr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 3e15d2894fb35432d2a111db36fe8ba8ebc62024 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: b548fc8e5592b577d29aabf9cf2e79d5385ae549 Maintainer: takagi Status: ready -->
 <!-- Credits: mumumu -->
 <refentry xml:id="function.grapheme-substr" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -11,10 +11,10 @@
   &reftitle.description;
   <para>&style.procedural;</para>
   <methodsynopsis>
-   <type>string</type><methodname>grapheme_substr</methodname>
+   <type class="union"><type>string</type><type>false</type></type><methodname>grapheme_substr</methodname>
    <methodparam><type>string</type><parameter>string</parameter></methodparam>
-   <methodparam><type>int</type><parameter>start</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>length</parameter></methodparam>
+   <methodparam><type>int</type><parameter>offset</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>length</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    部分文字列を返します。
@@ -34,7 +34,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>start</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>
        デフォルトの書記素単位での開始位置。
@@ -66,7 +66,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   $string の部分文字列を返します。
+   <parameter>string</parameter> の部分文字列を返します。
+   &return.falseforfailure;
   </para>
  </refsect1>
  
@@ -108,7 +109,6 @@ a%CC%8Abco%CC%88
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/idn/idn-to-ascii.xml b/reference/intl/idn/idn-to-ascii.xml
index 32454a7c85..194e1161a4 100644
--- a/reference/intl/idn/idn-to-ascii.xml
+++ b/reference/intl/idn/idn-to-ascii.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: b95d28e6ec86e4a71e012737d36ebdc1cf009180 Maintainer: mumumu Status: ready -->
+<!-- EN-Revision: b548fc8e5592b577d29aabf9cf2e79d5385ae549 Maintainer: mumumu Status: ready -->
 <refentry xml:id="function.idn-to-ascii" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>idn_to_ascii</refname>
@@ -12,9 +12,9 @@
   <methodsynopsis>
    <type class="union"><type>string</type><type>false</type></type><methodname>idn_to_ascii</methodname>
    <methodparam><type>string</type><parameter>domain</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>IDNA_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>variant</parameter><initializer>INTL_IDNA_VARIANT_UTS46</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter role="reference">idna_info</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>IDNA_DEFAULT</constant></initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>variant</parameter><initializer><constant>INTL_IDNA_VARIANT_UTS46</constant></initializer></methodparam>
+   <methodparam choice="opt"><type>array</type><parameter role="reference">idna_info</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Unicode のドメイン名を、IDNAが定めたASCII形式に変換します。
@@ -34,7 +34,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>options</parameter></term>
+     <term><parameter>flags</parameter></term>
      <listitem>
       <para>
        変換オプション - IDNA_ ではじまる定数
@@ -143,7 +143,6 @@ xn--tst-qla.de
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/idn/idn-to-utf8.xml b/reference/intl/idn/idn-to-utf8.xml
index 853cc1ac30..8ce74a45a1 100644
--- a/reference/intl/idn/idn-to-utf8.xml
+++ b/reference/intl/idn/idn-to-utf8.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: b95d28e6ec86e4a71e012737d36ebdc1cf009180 Maintainer: mumumu Status: ready -->
+<!-- EN-Revision: b548fc8e5592b577d29aabf9cf2e79d5385ae549 Maintainer: mumumu Status: ready -->
 <refentry xml:id="function.idn-to-utf8" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>idn_to_utf8</refname>
@@ -12,9 +12,9 @@
   <methodsynopsis>
    <type class="union"><type>string</type><type>false</type></type><methodname>idn_to_utf8</methodname>
    <methodparam><type>string</type><parameter>domain</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>IDNA_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>variant</parameter><initializer>INTL_IDNA_VARIANT_UTS46</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter role="reference">idna_info</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>variant</parameter><initializer><constant>INTL_IDNA_VARIANT_UTS46</constant></initializer></methodparam>
+   <methodparam choice="opt"><type>array</type><parameter role="reference">idna_info</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    IDNAのASCII方式でエンコードされたドメイン名をUTF-8でエンコードされたUnicodeに変換します。
@@ -34,7 +34,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>options</parameter></term>
+     <term><parameter>flags</parameter></term>
      <listitem>
       <para>
        変換オプション - IDNA_ ではじまる定数
@@ -143,7 +143,6 @@ tast.de
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml