com doc/fr: Apply commit 03841ffe3790dfcaef8d60decb6a011774df3727: 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.xm

diff --git a/reference/intl/collator.xml b/reference/intl/collator.xml
index 0a460902ad..60d7902f6f 100755
--- 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: dams Status: ready -->
+<!-- EN-Revision: 03841ffe3790dfcaef8d60decb6a011774df3727 Maintainer: dams Status: ready -->
 <!-- Reviewed: no -->
 
 <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">
@@ -38,9 +38,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 eaeb1f0017..54dac21602 100755
--- 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: yannick Status: ready -->
+<!-- EN-Revision: 03841ffe3790dfcaef8d60decb6a011774df3727 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
 
 <refentry xml:id="collator.asort" xmlns="http://docbook.org/ns/docbook">
@@ -15,22 +15,19 @@
   <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>
    Cette fonction trie un tableau en maintenant l'association entre les 
@@ -48,7 +45,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>coll</parameter></term>
+     <term><parameter>object</parameter></term>
      <listitem>
       <para>
        Objet <classname>Collator</classname>.
@@ -56,13 +53,13 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>arr</parameter></term>
+     <term><parameter>array</parameter></term>
      <listitem>
       <para>&array; de chaînes à trier.</para>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>sort_flag</parameter></term>
+     <term><parameter>flags</parameter></term>
      <listitem>
       <para>
        Type de tri, optionnel, choisi parmi les constantes suivantes :
@@ -155,7 +152,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 7f2611b383..d73be5f794 100755
--- 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: yannick Status: ready -->
+<!-- EN-Revision: 03841ffe3790dfcaef8d60decb6a011774df3727 Maintainer: yannick Status: ready -->
 <!-- Reviewed: yes -->
 
 <refentry xml:id="collator.compare" xmlns="http://docbook.org/ns/docbook">
@@ -15,22 +15,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>
    Compare deux chaînes Unicode en fonction des règles de collation.
@@ -42,7 +39,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>coll</parameter></term>
+     <term><parameter>object</parameter></term>
      <listitem>
       <para>
        Objet <classname>Collator</classname>.
@@ -50,7 +47,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>str1</parameter></term>
+     <term><parameter>string1</parameter></term>
      <listitem>
       <para>
        La première chaîne à comparer.
@@ -58,7 +55,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>str2</parameter></term>
+     <term><parameter>string2</parameter></term>
      <listitem>
       <para>
        La deuxième chaîne à comparer.
@@ -76,20 +73,20 @@
    <itemizedlist>
     <listitem>
      <para>
-      1 si <parameter>str1</parameter> est <emphasis>plus grand</emphasis> que
-      <parameter>str2</parameter> ;
+      1 si <parameter>string1</parameter> est <emphasis>plus grand</emphasis> que
+      <parameter>string2</parameter> ;
      </para>
     </listitem>
     <listitem>
      <para>
-      0 si <parameter>str1</parameter> est <emphasis>égal</emphasis> à
-      <parameter>str2</parameter>;
+      0 si <parameter>string1</parameter> est <emphasis>égal</emphasis> à
+      <parameter>string2</parameter>;
      </para>
     </listitem>
     <listitem>
      <para>
-      -1 si <parameter>str1</parameter> est <emphasis>plus petit</emphasis> que
-      <parameter>str2</parameter> .
+      -1 si <parameter>string1</parameter> est <emphasis>plus petit</emphasis> que
+      <parameter>string2</parameter> .
      </para>
     </listitem>
    </itemizedlist>
@@ -141,7 +138,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 cea87812fb..86ccff03c4 100755
--- a/reference/intl/collator/create.xml
+++ b/reference/intl/collator/create.xml
@@ -13,19 +13,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>
@@ -92,7 +88,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 66014e6e36..1a783a81b4 100755
--- 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: yannick Status: ready -->
+<!-- EN-Revision: 03841ffe3790dfcaef8d60decb6a011774df3727 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
 
 <refentry xml:id="collator.getattribute" xmlns="http://docbook.org/ns/docbook">
@@ -15,20 +15,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>
    Lit un attribut de collation.
@@ -40,7 +37,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>coll</parameter></term>
+     <term><parameter>object</parameter></term>
      <listitem>
       <para>
        Objet <classname>Collator</classname>.
@@ -48,7 +45,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>attr</parameter></term>
+     <term><parameter>attribute</parameter></term>
      <listitem>
       <para>
        L'attribut à lire.
@@ -99,7 +96,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 c6c2894959..3cb316df9f 100755
--- 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: yannick Status: ready -->
+<!-- EN-Revision: 03841ffe3790dfcaef8d60decb6a011774df3727 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
 
 <refentry xml:id="collator.geterrorcode" xmlns="http://docbook.org/ns/docbook">
@@ -15,19 +15,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 -->
@@ -39,7 +36,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>coll</parameter></term>
+     <term><parameter>object</parameter></term>
      <listitem>
       <para>
        Objet <classname>Collator</classname>.
@@ -55,7 +52,8 @@
   &reftitle.returnvalues;
   <para>
    Le code d'erreur retourné par le dernier appel à un objet
-   de l'<acronym>API</acronym> <classname>Collator</classname>.
+   de l'<acronym>API</acronym> <classname>Collator</classname>,
+   &return.falseforfailure;.
   </para>
  </refsect1>
 
@@ -86,7 +84,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 fa0355a846..85f3c83143 100755
--- 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: yannick Status: ready -->
+<!-- EN-Revision: 03841ffe3790dfcaef8d60decb6a011774df3727 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
 
 <refentry xml:id="collator.geterrormessage" xmlns="http://docbook.org/ns/docbook">
@@ -15,19 +15,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>
    Lit le dernier message d'erreur.
@@ -39,7 +36,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>coll</parameter></term>
+     <term><parameter>object</parameter></term>
      <listitem>
       <para>
        Object <classname>Collator</classname>.
@@ -54,9 +51,9 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   La description d'une erreur survenue lors du dernier 
-   appel à une méthode de l'<acronym>API</acronym>
-   <classname>Collator</classname>.
+   La description d'une erreur survenue lors du dernier appel à une méthode de
+   l'<acronym>API</acronym> <classname>Collator</classname>,
+   &return.falseforfailure;.
   </para>
  </refsect1>
 
@@ -88,7 +85,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 c327cf244a..ce12d312e5 100755
--- 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: yannick Status: ready -->
+<!-- EN-Revision: 03841ffe3790dfcaef8d60decb6a011774df3727 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
 
 <refentry xml:id="collator.getlocale" xmlns="http://docbook.org/ns/docbook">
@@ -15,19 +15,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>
@@ -40,7 +37,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>coll</parameter></term>
+     <term><parameter>object</parameter></term>
      <listitem>
       <para>
        Objet <classname>Collator</classname>.
@@ -109,7 +106,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 d50983278e..be1457c341 100644
--- a/reference/intl/collator/get-sort-key.xml
+++ b/reference/intl/collator/get-sort-key.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: b95d28e6ec86e4a71e012737d36ebdc1cf009180 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 03841ffe3790dfcaef8d60decb6a011774df3727 Maintainer: yannick Status: ready -->
 <!--  Reviewed: no -->
 
 <refentry xml:id="collator.getsortkey" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>Collator::getSortKey</refname>
   <refname>collator_get_sort_key</refname>
-  <refpurpose>Recupère la clé de tri pour une chaine</refpurpose>
+  <refpurpose>Récupère la clé de tri pour une chaine</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -15,28 +15,25 @@
   <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>
    Retourne la clé de la collation pour une chaîne.
    Les clés de collation peuvent être comparées directement au lieu de chaînes,
    néanmoins elles sont spécifique à l'implémentation et peuvent changer entre
-   les versions de la bibliothéque ICU. Les clés de tries sont généralement
+   les versions de la bibliothèque ICU. Les clés de tries sont généralement
    seulement utile dans les bases de données ou autres circonstances où les
-   appels de fonctions sont extrêment cher.
+   appels de fonctions sont extrêmement cher.
   </para>
  </refsect1>
 
@@ -45,7 +42,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>coll</parameter></term>
+     <term><parameter>object</parameter></term>
      <listitem>
       <para>
        Objet <classname>Collator</classname>.
@@ -53,7 +50,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>str</parameter></term>
+     <term><parameter>string</parameter></term>
      <listitem>
       <para>
        La chaine depuis laquelle produire la clé.
@@ -127,7 +124,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 ac7ae4d000..219b7212cd 100755
--- 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: yannick Status: ready -->
+<!-- EN-Revision: 03841ffe3790dfcaef8d60decb6a011774df3727 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
 
 <refentry xml:id="collator.getstrength" xmlns="http://docbook.org/ns/docbook">
@@ -15,19 +15,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>
   </para>
@@ -38,7 +35,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>coll</parameter></term>
+     <term><parameter>object</parameter></term>
      <listitem>
       <para>
        Objet <classname>Collator</classname>.
@@ -93,7 +90,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 b44bbf4598..d190fc37d5 100755
--- 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: yannick Status: ready -->
+<!-- EN-Revision: 03841ffe3790dfcaef8d60decb6a011774df3727 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
 
 <refentry xml:id="collator.setattribute" xmlns="http://docbook.org/ns/docbook">
@@ -15,22 +15,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 -->
@@ -42,7 +39,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>coll</parameter></term>
+     <term><parameter>object</parameter></term>
      <listitem>
       <para>
        Objet <classname>Collator</classname>.
@@ -50,16 +47,16 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>attr</parameter></term>
+     <term><parameter>attribute</parameter></term>
      <listitem>
       <para>L'attribut.</para>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>val</parameter></term>
+     <term><parameter>value</parameter></term>
      <listitem>
       <para>
-       La valeur de l'attribute.
+       La valeur de l'attribut.
       </para>
      </listitem>
     </varlistentry>
@@ -107,7 +104,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 fd02f42425..8c6c4dfd4a 100755
--- 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: yannick Status: ready -->
+<!-- EN-Revision: 03841ffe3790dfcaef8d60decb6a011774df3727 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
 
 <refentry xml:id="collator.setstrength" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -15,24 +15,21 @@
   <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>
    Le service de collation <link xlink:href="&url.icu.home;">ICU</link>
-   suporte de nombreux niveaux de comparaison (appelés "Levels", mais aussi
+   supporte de nombreux niveaux de comparaison (appelés "Levels", mais aussi
    connus sous le nom de "Strengths"). Avec ces categories, ICU peut trier les
    chaînes avec précision, en fonction des conventions locales. Cependant, en
    permettant l'utilisation selective des niveaux, la recherche d'une chaîne
@@ -124,7 +121,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>coll</parameter></term>
+     <term><parameter>object</parameter></term>
      <listitem>
       <para>
        Objet <classname>Collator</classname>.
@@ -234,7 +231,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 69bc6e46c7..ef5bf4770f 100755
--- 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: yannick Status: ready -->
+<!-- EN-Revision: 03841ffe3790dfcaef8d60decb6a011774df3727 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
 
 <refentry xml:id="collator.sortwithsortkeys" xmlns="http://docbook.org/ns/docbook">
@@ -15,20 +15,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>
    Similaire à <function>collator_sort</function>, mais utilise le tri de clé
@@ -42,7 +39,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>coll</parameter></term>
+     <term><parameter>object</parameter></term>
      <listitem>
       <para>
        Objet <classname>Collator</classname>.
@@ -50,7 +47,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>arr</parameter></term>
+     <term><parameter>array</parameter></term>
      <listitem>
       <para>&array; de chaîne à trier</para>
      </listitem>
@@ -107,7 +104,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 55461ea533..b64cadacbb 100755
--- 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: yannick Status: ready -->
+<!-- EN-Revision: 03841ffe3790dfcaef8d60decb6a011774df3727 Maintainer: yannick Status: ready -->
 <!-- Reviewed: no -->
 
 <refentry xml:id="collator.sort" xmlns="http://docbook.org/ns/docbook">
@@ -15,22 +15,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>
    Cette fonction trie un tableau en fonction des conventions locales.
@@ -45,7 +42,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>coll</parameter></term>
+     <term><parameter>object</parameter></term>
      <listitem>
       <para>
        Objet <classname>Collator</classname>.
@@ -53,7 +50,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>arr</parameter></term>
+     <term><parameter>array</parameter></term>
      <listitem>
       <para>
        &array; de chaînes à trier.
@@ -61,7 +58,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>sort_flag</parameter></term>
+     <term><parameter>flags</parameter></term>
      <listitem>
       <para>
        Type de tri, optionnel, choisi parmi les constantes suivantes :
@@ -89,7 +86,7 @@
        </itemizedlist>
        Le type de tri par défaut est <constant>Collator::SORT_REGULAR</constant>.
        Il est également utilisé si une valeur invalide du
-       paramètre <parameter>sort_flag</parameter> est utilisée.
+       paramètre <parameter>flags</parameter> est utilisée.
       </para>
      </listitem>
     </varlistentry>
@@ -151,7 +148,6 @@ array (
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
  Local variables:
  mode: sgml