com doc/fr: Apply commit b548fc8e5592b577d29aabf9cf2e79d5385ae549: 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/grapheme/g

[email protected] (George Peter Banyard) Wed, 17 Feb 2021 04:02:38 +0000
Newsgroups php.doc.fr
Message-ID <[email protected]>
Commit:    84b014d3751e99d36644368f874bb013df83e0ed
Author:    George Peter Banyard <[email protected]>         Wed, 17 Feb 2021 04:02:38 +0000
Parents:   017776a3f563f05a02b64120192526094f6ca8f3
Branches:  master

Link:       http://git.php.net/?p=doc/fr.git;a=commitdiff;h=84b014d3751e99d36644368f874bb013df83e0ed

Log:
Apply commit b548fc8e5592b577d29aabf9cf2e79d5385ae549

Generate intl methodsynopses based on stubs - Grapheme, IDN

Changed paths:
  M  reference/intl/grapheme/grapheme-extract.xml
  M  reference/intl/grapheme/grapheme-stripos.xml
  M  reference/intl/grapheme/grapheme-stristr.xml
  M  reference/intl/grapheme/grapheme-strlen.xml
  M  reference/intl/grapheme/grapheme-strpos.xml
  M  reference/intl/grapheme/grapheme-strripos.xml
  M  reference/intl/grapheme/grapheme-strrpos.xml
  M  reference/intl/grapheme/grapheme-strstr.xml
  M  reference/intl/grapheme/grapheme-substr.xml
  M  reference/intl/idn/idn-to-ascii.xml
  M  reference/intl/idn/idn-to-utf8.xml
diff_84b014d3751e99d36644368f874bb013df83e0ed.txt (text/plain, 20.4 KB)
diff --git a/reference/intl/grapheme/grapheme-extract.xml b/reference/intl/grapheme/grapheme-extract.xml
index e4e54e91e5..355c98af85 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: yannick Status: ready -->
+<!-- EN-Revision: b548fc8e5592b577d29aabf9cf2e79d5385ae549 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
 <!-- CREDITS: DAnnebicque -->
 
@@ -13,12 +13,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>
    Cette fonction extrait une séquence de groupes de graphèmes par défaut
@@ -47,7 +47,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>extract_type</parameter></term>
+     <term><parameter>type</parameter></term>
      <listitem>
       <para>
        Définit le type d'unités indiquées par le paramètre $size :
@@ -64,7 +64,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>start</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>
        La position de début dans $haystack, exprimée en octets. Elle doit être positive,
@@ -94,7 +94,8 @@
   &reftitle.returnvalues;
   <para>
    Une chaîne qui débute à la position $start et se termine à la limite valide
-   d'un graphème, et qui se conformen aux conditions $size et $extract_type.
+   d'un graphème, et qui se conforment aux conditions $size et $extract_type spécifiées,
+   &return.falseforfailure;.
   </para>
  </refsect1>
  
@@ -112,7 +113,7 @@
      <row>
       <entry>7.1.0</entry>
       <entry>
-       Le support des valeurs nagatives pour  <parameter>start</parameter>s a été ajouté.
+       Le support des valeurs négatives pour <parameter>offset</parameter> a été ajouté.
       </entry>
      </row>
     </tbody>
@@ -159,7 +160,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 221cb69239..6dc5962a3b 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: yannick Status: ready -->
+<!-- EN-Revision: b548fc8e5592b577d29aabf9cf2e79d5385ae549 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
 <!-- CREDITS: DAnnebicque -->
 
@@ -13,7 +13,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>
@@ -136,7 +136,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 6877abd469..ae758bc74c 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: yannick Status: ready -->
+<!-- EN-Revision: b548fc8e5592b577d29aabf9cf2e79d5385ae549 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
 <!-- CREDITS: DAnnebicque -->
 
@@ -13,10 +13,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>
    Retourne la partie d'une chaîne à partir de la première occurrence de 
@@ -46,7 +46,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>before_needle</parameter></term>
+     <term><parameter>beforeNeedle</parameter></term>
      <listitem>
       <para>
        Si &true;, <function>grapheme_stristr</function> retourne la
@@ -111,7 +111,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 53a102c6be..3ea2b8457b 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: yannick Status: ready -->
+<!-- EN-Revision: b548fc8e5592b577d29aabf9cf2e79d5385ae549 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
 
 <refentry xml:id="function.grapheme-strlen" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -12,8 +12,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>
    Lit la taille d'une chaîne en nombre de graphème (et non pas en
@@ -26,7 +26,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>input</parameter></term>
+     <term><parameter>string</parameter></term>
      <listitem>
       <para>
        La chaîne à mesurer. Elle doit être une chaîne UTF-8 valide.
@@ -41,7 +41,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   La taille de la chaîne, et 0 si la chaîne est vide.
+   La taille de la chaîne en cas de succès, &return.falseforfailure;.
   </para>
  </refsect1>
  
@@ -86,7 +86,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 a5ab03efbf..3b00bf7360 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: yannick Status: ready -->
+<!-- EN-Revision: b548fc8e5592b577d29aabf9cf2e79d5385ae549 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
 <!-- CREDITS: DAnnebicque -->
 
@@ -13,13 +13,13 @@
   &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>
   </methodsynopsis>
   <para>
-   Trouve la position du permier graphème dans une chaîne.
+   Trouve la position du premier graphème dans une chaîne.
   </para>
   </refsect1>
 
@@ -134,7 +134,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 b258390f57..dd63a465b2 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: yannick Status: ready -->
+<!-- EN-Revision: b548fc8e5592b577d29aabf9cf2e79d5385ae549 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
 
 <refentry xml:id="function.grapheme-strripos" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -12,7 +12,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>
@@ -111,7 +111,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 d87479d58b..17490a302b 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: yannick Status: ready -->
+<!-- EN-Revision: b548fc8e5592b577d29aabf9cf2e79d5385ae549 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
 
 <refentry xml:id="function.grapheme-strrpos" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -12,7 +12,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>
@@ -108,7 +108,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 544af59cb1..70a29687a1 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: yannick Status: ready -->
+<!-- EN-Revision: b548fc8e5592b577d29aabf9cf2e79d5385ae549 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
 <!-- CREDITS: DAnnebicque -->
 
@@ -13,10 +13,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>
    Retourne la partie d'une chaîne à partir de la première occurrence de
@@ -46,7 +46,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>before_needle</parameter></term>
+     <term><parameter>beforeNeedle</parameter></term>
      <listitem>
       <para>
        Si &true;, <function>grapheme_strstr</function> retourne la
@@ -110,7 +110,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 79dcd1bb37..69a9195950 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: yannick Status: ready -->
+<!-- EN-Revision: b548fc8e5592b577d29aabf9cf2e79d5385ae549  Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
 <!-- CREDITS: DAnnebicque -->
 
@@ -13,10 +13,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>
    Retourne une partie d'une chaîne.
@@ -36,7 +36,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>start</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>
        La position de début, en unité par de graphèmes.
@@ -72,7 +72,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Retourne la partie de chaîne extraite de $string.   
+   Retourne la partie de chaîne extraite de <parameter>string</parameter>, &return.falseforfailure;.
   </para>
  </refsect1>
  
@@ -114,7 +114,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 3ba750425a..c403c83571 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: yannick Status: ready -->
+<!-- EN-Revision: b548fc8e5592b577d29aabf9cf2e79d5385ae549  Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
 <!-- CREDITS: DAnnebicque -->
 
@@ -15,9 +15,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>
    Cette fonction convertit un nom de domaine Unicode au format
@@ -38,7 +38,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>options</parameter></term>
+     <term><parameter>flags</parameter></term>
      <listitem>
       <para>
        Options de conversion - combinaison de constantes IDNA_*.
@@ -148,7 +148,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 df8e933e0c..005f807d53 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: yannick Status: ready -->
+<!-- EN-Revision: b548fc8e5592b577d29aabf9cf2e79d5385ae549 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
 <!-- CREDITS: DAnnebicque -->
 
@@ -15,9 +15,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>
    Cette fonction convertit le nom de domaine au format IDNA ASCII-compatible en
@@ -39,7 +39,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>options</parameter></term>
+     <term><parameter>flags</parameter></term>
      <listitem>
       <para>
        Options de conversion - une combinaison des constantes
@@ -150,7 +150,6 @@ täst.de
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml