From 5aad38d568c08ca2cff9afca748cc25e91202f7c Mon Sep 17 00:00:00 2001
From: Hannes Magnusson <bjori@php.net>
Date: Sun, 27 Jan 2008 19:48:18 +0000
Subject: [PATCH] Remove classsynopsis and add the classname to <methodname>

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@251462 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/intl/locale/compose-locale.xml      | 19 ++++-------
 reference/intl/locale/filter-matches.xml      | 21 +++++-------
 reference/intl/locale/get-all-variants.xml    | 19 ++++-------
 reference/intl/locale/get-default.xml         | 19 ++++-------
 .../intl/locale/get-display-language.xml      | 21 +++++-------
 reference/intl/locale/get-display-name.xml    | 21 +++++-------
 reference/intl/locale/get-display-region.xml  | 21 +++++-------
 reference/intl/locale/get-display-script.xml  | 21 +++++-------
 reference/intl/locale/get-display-variant.xml | 21 +++++-------
 reference/intl/locale/get-keywords.xml        | 19 ++++-------
 .../intl/locale/get-primary-language.xml      | 19 ++++-------
 reference/intl/locale/get-region.xml          | 19 ++++-------
 reference/intl/locale/get-script.xml          | 19 ++++-------
 reference/intl/locale/lookup.xml              | 23 +++++--------
 reference/intl/locale/parse-locale.xml        | 19 ++++-------
 reference/intl/locale/set-default.xml         | 19 ++++-------
 reference/intl/messageformatter/create.xml    | 34 +++++++------------
 .../intl/messageformatter/format-message.xml  | 23 +++++--------
 reference/intl/messageformatter/format.xml    | 17 ++++------
 .../intl/messageformatter/get-error-code.xml  | 17 ++++------
 .../messageformatter/get-error-message.xml    | 17 ++++------
 .../intl/messageformatter/get-locale.xml      | 17 ++++------
 .../intl/messageformatter/get-pattern.xml     | 17 ++++------
 .../intl/messageformatter/parse-message.xml   | 21 +++++-------
 reference/intl/messageformatter/parse.xml     | 17 ++++------
 .../intl/messageformatter/set-pattern.xml     | 17 ++++------
 reference/intl/normalizer/is-normalized.xml   | 21 +++++-------
 reference/intl/normalizer/normalize.xml       | 21 +++++-------
 28 files changed, 207 insertions(+), 352 deletions(-)

diff --git a/reference/intl/locale/compose-locale.xml b/reference/intl/locale/compose-locale.xml
index a12ece16ad..d400a61cf4 100755
--- a/reference/intl/locale/compose-locale.xml
+++ b/reference/intl/locale/compose-locale.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry xml:id="locale.composelocale" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>Locale::composeLocale</refname>
@@ -12,17 +12,12 @@
   <para>
    Object oriented style
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>Locale</classname> 
-   </ooclass>
-   <methodsynopsis>
-    <modifier>static</modifier>
-    <type>string</type>
-    <methodname>composeLocale</methodname>
-    <methodparam><type>array</type><parameter>subtags</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <modifier>static</modifier>
+   <type>string</type>
+   <methodname>Locale::composeLocale</methodname>
+   <methodparam><type>array</type><parameter>subtags</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Procedural style
   </para>
diff --git a/reference/intl/locale/filter-matches.xml b/reference/intl/locale/filter-matches.xml
index 844c66b28b..4823e59b42 100755
--- a/reference/intl/locale/filter-matches.xml
+++ b/reference/intl/locale/filter-matches.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="locale.filtermatches">
  <refnamediv>
   <refname>Locale::filterMatches</refname>
@@ -12,18 +12,13 @@
   <para>
    Object oriented style
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>Locale</classname>
-   </ooclass>
-   <methodsynopsis>
-    <modifier>static</modifier>
-    <type>boolean</type>
-    <methodname>filterMatches</methodname>
-    <methodparam><type>string</type><parameter>langtag</parameter></methodparam>
-    <methodparam><type>string</type><parameter>locale</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <modifier>static</modifier>
+   <type>boolean</type>
+   <methodname>Locale::filterMatches</methodname>
+   <methodparam><type>string</type><parameter>langtag</parameter></methodparam>
+   <methodparam><type>string</type><parameter>locale</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Procedural style
   </para>
diff --git a/reference/intl/locale/get-all-variants.xml b/reference/intl/locale/get-all-variants.xml
index 05227d9552..0b9d556dc1 100755
--- a/reference/intl/locale/get-all-variants.xml
+++ b/reference/intl/locale/get-all-variants.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="locale.getallvariants">
  <refnamediv>
   <refname>Locale::getAllVariants</refname>
@@ -12,17 +12,12 @@
   <para>
    Object oriented style
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>Locale</classname>
-   </ooclass>
-   <methodsynopsis>
-    <modifier>static</modifier>
-    <type>array</type>
-    <methodname>getAllVariants</methodname>
-    <methodparam><type>string</type><parameter>locale</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <modifier>static</modifier>
+   <type>array</type>
+   <methodname>Locale::getAllVariants</methodname>
+   <methodparam><type>string</type><parameter>locale</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Procedural style
   </para>
diff --git a/reference/intl/locale/get-default.xml b/reference/intl/locale/get-default.xml
index ae858fcf7b..097460d94d 100755
--- a/reference/intl/locale/get-default.xml
+++ b/reference/intl/locale/get-default.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="locale.getdefault">
  <refnamediv>
   <refname>Locale::getDefault</refname>
@@ -12,17 +12,12 @@
   <para>
    Object oriented style
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>Locale</classname>
-   </ooclass>
-   <methodsynopsis>
-    <modifier>static</modifier>
-    <type>string</type>
-    <methodname>getDefault</methodname>
-    <void />
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <modifier>static</modifier>
+   <type>string</type>
+   <methodname>Locale::getDefault</methodname>
+   <void />
+  </methodsynopsis>
   <para>
    Procedural style
   </para>
diff --git a/reference/intl/locale/get-display-language.xml b/reference/intl/locale/get-display-language.xml
index 7801f4f521..79a7c09880 100755
--- a/reference/intl/locale/get-display-language.xml
+++ b/reference/intl/locale/get-display-language.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="locale.getdisplaylanguage">
  <refnamediv>
   <refname>Locale::getDisplayLanguage</refname>
@@ -12,18 +12,13 @@
   <para>
    Object oriented style
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>Locale</classname>
-   </ooclass>
-   <methodsynopsis>
-    <modifier>static</modifier>
-    <type>string</type>
-    <methodname>getDisplayLanguage</methodname>
-    <methodparam><type>string</type><parameter>locale</parameter></methodparam>
-    <methodparam choice="opt"><type>string</type><parameter>in_locale</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <modifier>static</modifier>
+   <type>string</type>
+   <methodname>Locale::getDisplayLanguage</methodname>
+   <methodparam><type>string</type><parameter>locale</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>in_locale</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Procedural style
   </para>
diff --git a/reference/intl/locale/get-display-name.xml b/reference/intl/locale/get-display-name.xml
index 56b464d0f5..a63e351110 100755
--- a/reference/intl/locale/get-display-name.xml
+++ b/reference/intl/locale/get-display-name.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="locale.getdisplayname">
  <refnamediv>
   <refname>Locale::getDisplayName</refname>
@@ -12,18 +12,13 @@
   <para>
    Object oriented style
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>Locale</classname>
-   </ooclass>
-   <methodsynopsis>
-    <modifier>static</modifier>
-    <type>string</type>
-    <methodname>getDisplayName</methodname>
-    <methodparam><type>string</type><parameter>locale</parameter></methodparam>
-    <methodparam choice="opt"><type>string</type><parameter>in_locale</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <modifier>static</modifier>
+   <type>string</type>
+   <methodname>Locale::getDisplayName</methodname>
+   <methodparam><type>string</type><parameter>locale</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>in_locale</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Procedural style
   </para>
diff --git a/reference/intl/locale/get-display-region.xml b/reference/intl/locale/get-display-region.xml
index 29f4183099..2ee3345ac4 100755
--- a/reference/intl/locale/get-display-region.xml
+++ b/reference/intl/locale/get-display-region.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="locale.getdisplayregion">
  <refnamediv>
   <refname>Locale::getDisplayRegion</refname>
@@ -12,18 +12,13 @@
   <para>
    Object oriented style
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>Locale</classname>
-   </ooclass>
-   <methodsynopsis>
-    <modifier>static</modifier>
-    <type>string</type>
-    <methodname>getDisplayRegion</methodname>
-    <methodparam><type>string</type><parameter>locale</parameter></methodparam>
-    <methodparam choice="opt"><type>string</type><parameter>in_locale</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <modifier>static</modifier>
+   <type>string</type>
+   <methodname>Locale::getDisplayRegion</methodname>
+   <methodparam><type>string</type><parameter>locale</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>in_locale</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Procedural style
   </para>
diff --git a/reference/intl/locale/get-display-script.xml b/reference/intl/locale/get-display-script.xml
index 1c1f17554b..ec645dd27b 100755
--- a/reference/intl/locale/get-display-script.xml
+++ b/reference/intl/locale/get-display-script.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="locale.getdisplayscript">
  <refnamediv>
   <refname>Locale::getDisplayScript</refname>
@@ -12,18 +12,13 @@
   <para>
    Object oriented style
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>Locale</classname>
-   </ooclass>
-   <methodsynopsis>
-    <modifier>static</modifier>
-    <type>string</type>
-    <methodname>getDisplayScript</methodname>
-    <methodparam><type>string</type><parameter>locale</parameter></methodparam>
-    <methodparam choice="opt"><type>string</type><parameter>in_locale</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <modifier>static</modifier>
+   <type>string</type>
+   <methodname>Locale::getDisplayScript</methodname>
+   <methodparam><type>string</type><parameter>locale</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>in_locale</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Procedural style
   </para>
diff --git a/reference/intl/locale/get-display-variant.xml b/reference/intl/locale/get-display-variant.xml
index b1e966e50b..241a1041cf 100755
--- a/reference/intl/locale/get-display-variant.xml
+++ b/reference/intl/locale/get-display-variant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="locale.getdisplayvariant">
  <refnamediv>
   <refname>Locale::getDisplayVariant</refname>
@@ -12,18 +12,13 @@
   <para>
    Object oriented style
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>Locale</classname> 
-   </ooclass>
-   <methodsynopsis>
-    <modifier>static</modifier>
-    <type>string</type>
-    <methodname>getDisplayVariant</methodname>
-    <methodparam><type>string</type><parameter>locale</parameter></methodparam>
-    <methodparam choice="opt"><type>string</type><parameter>in_locale</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <modifier>static</modifier>
+   <type>string</type>
+   <methodname>Locale::getDisplayVariant</methodname>
+   <methodparam><type>string</type><parameter>locale</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>in_locale</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Procedural style
   </para>
diff --git a/reference/intl/locale/get-keywords.xml b/reference/intl/locale/get-keywords.xml
index 5bba9d8b01..d331b858bf 100755
--- a/reference/intl/locale/get-keywords.xml
+++ b/reference/intl/locale/get-keywords.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="locale.getkeywords">
  <refnamediv>
   <refname>Locale::getKeywords</refname>
@@ -12,17 +12,12 @@
   <para>
    Object oriented style
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>Locale</classname>
-   </ooclass>
-   <methodsynopsis>
-    <modifier>static</modifier>
-    <type>array</type>
-    <methodname>getKeywords</methodname>
-    <methodparam><type>string</type><parameter>locale</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <modifier>static</modifier>
+   <type>array</type>
+   <methodname>Locale::getKeywords</methodname>
+   <methodparam><type>string</type><parameter>locale</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Procedural style
   </para>
diff --git a/reference/intl/locale/get-primary-language.xml b/reference/intl/locale/get-primary-language.xml
index e08a8e7d63..b0cd42b74f 100755
--- a/reference/intl/locale/get-primary-language.xml
+++ b/reference/intl/locale/get-primary-language.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="locale.getprimarylanguage">
  <refnamediv>
   <refname>Locale::getPrimaryLanguage</refname>
@@ -12,17 +12,12 @@
   <para>
    Object oriented style
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>Locale</classname> 
-   </ooclass>
-   <methodsynopsis>
-    <modifier>static</modifier>
-    <type>string</type>
-    <methodname>getPrimaryLanguage</methodname>
-    <methodparam><type>string</type><parameter>locale</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <modifier>static</modifier>
+   <type>string</type>
+   <methodname>Locale::getPrimaryLanguage</methodname>
+   <methodparam><type>string</type><parameter>locale</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Procedural style
   </para>
diff --git a/reference/intl/locale/get-region.xml b/reference/intl/locale/get-region.xml
index 5913fb4e53..b4e9885a15 100755
--- a/reference/intl/locale/get-region.xml
+++ b/reference/intl/locale/get-region.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="locale.getregion">
  <refnamediv>
   <refname>Locale::getRegion</refname>
@@ -12,17 +12,12 @@
   <para>
    Object oriented style
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>Locale</classname> 
-   </ooclass>
-   <methodsynopsis>
-    <modifier>static</modifier>
-    <type>string</type>
-    <methodname>getRegion</methodname>
-    <methodparam><type>string</type><parameter>locale</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <modifier>static</modifier>
+   <type>string</type>
+   <methodname>Locale::getRegion</methodname>
+   <methodparam><type>string</type><parameter>locale</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Procedural style
   </para>
diff --git a/reference/intl/locale/get-script.xml b/reference/intl/locale/get-script.xml
index 9f6ae8db3b..7bd00cfc46 100755
--- a/reference/intl/locale/get-script.xml
+++ b/reference/intl/locale/get-script.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="locale.getscript">
  <refnamediv>
   <refname>Locale::getScript</refname>
@@ -12,17 +12,12 @@
   <para>
    Object oriented style
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>Locale</classname> 
-   </ooclass>
-   <methodsynopsis>
-    <modifier>static</modifier>
-    <type>string</type>
-    <methodname>getScript</methodname>
-    <methodparam><type>string</type><parameter>locale</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <modifier>static</modifier>
+   <type>string</type>
+   <methodname>Locale::getScript</methodname>
+   <methodparam><type>string</type><parameter>locale</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Procedural style
   </para>
diff --git a/reference/intl/locale/lookup.xml b/reference/intl/locale/lookup.xml
index 11c73c7a38..4bb6fd93ee 100755
--- a/reference/intl/locale/lookup.xml
+++ b/reference/intl/locale/lookup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="locale.lookup">
  <refnamediv>
   <refname>Locale::lookup</refname>
@@ -12,19 +12,14 @@
   <para>
    Object oriented style
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>Locale</classname> 
-   </ooclass>
-   <methodsynopsis>
-    <modifier>static</modifier>
-    <type>string</type>
-    <methodname>lookup</methodname>
-    <methodparam><type>array</type><parameter>langtag</parameter></methodparam>
-    <methodparam><type>string</type><parameter>locale</parameter></methodparam>
-    <methodparam><type>string</type><parameter>default</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <modifier>static</modifier>
+   <type>string</type>
+   <methodname>Locale::lookup</methodname>
+   <methodparam><type>array</type><parameter>langtag</parameter></methodparam>
+   <methodparam><type>string</type><parameter>locale</parameter></methodparam>
+   <methodparam><type>string</type><parameter>default</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Procedural style
   </para>
diff --git a/reference/intl/locale/parse-locale.xml b/reference/intl/locale/parse-locale.xml
index f9e898d4f7..eb325c51e6 100755
--- a/reference/intl/locale/parse-locale.xml
+++ b/reference/intl/locale/parse-locale.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="locale.parselocale">
  <refnamediv>
   <refname>Locale::parseLocale</refname>
@@ -12,17 +12,12 @@
   <para>
    Object oriented style
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>Locale</classname>
-   </ooclass>
-   <methodsynopsis>
-    <modifier>static</modifier>
-    <type>array</type>
-    <methodname>parseLocale</methodname>
-    <methodparam><type>string</type><parameter>locale</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <modifier>static</modifier>
+   <type>array</type>
+   <methodname>Locale::parseLocale</methodname>
+   <methodparam><type>string</type><parameter>locale</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Procedural style
   </para>
diff --git a/reference/intl/locale/set-default.xml b/reference/intl/locale/set-default.xml
index f554c01f46..2a212700d5 100755
--- a/reference/intl/locale/set-default.xml
+++ b/reference/intl/locale/set-default.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="locale.setdefault">
  <refnamediv>
   <refname>Locale::setDefault</refname>
@@ -12,17 +12,12 @@
   <para>
    Object oriented style
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>Locale</classname> 
-   </ooclass>
-   <methodsynopsis>
-    <modifier>static</modifier>
-    <type>boolean</type>
-    <methodname>setDefault</methodname>
-    <methodparam><type>string</type><parameter>locale</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <modifier>static</modifier>
+   <type>boolean</type>
+   <methodname>Locale::setDefault</methodname>
+   <methodparam><type>string</type><parameter>locale</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Procedural style
   </para>
diff --git a/reference/intl/messageformatter/create.xml b/reference/intl/messageformatter/create.xml
index 52028c901f..0647069bd1 100755
--- a/reference/intl/messageformatter/create.xml
+++ b/reference/intl/messageformatter/create.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="messageformatter.create">
  <refnamediv>
   <refname>MessageFormatter::create</refname>
@@ -13,30 +13,20 @@
   <para>
    Object oriented style (method)
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>MessageFormatter</classname>
-   </ooclass>
-   <methodsynopsis>
-    <type>MessageFormatter</type>
-    <methodname>create</methodname>
-    <methodparam><type>string</type><parameter>locale</parameter></methodparam>
-    <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>MessageFormatter</type>
+   <methodname>MessageFormatter::create</methodname>
+   <methodparam><type>string</type><parameter>locale</parameter></methodparam>
+   <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Object oriented style (constructor):
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>MessageFormatter</classname>
-   </ooclass>
-   <constructorsynopsis>
-    <methodname>__construct</methodname>
-    <methodparam><type>string</type><parameter>locale</parameter></methodparam>
-    <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
-   </constructorsynopsis>
-  </classsynopsis>
+  <constructorsynopsis>
+   <methodname>MessageFormatter::__construct</methodname>
+   <methodparam><type>string</type><parameter>locale</parameter></methodparam>
+   <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
+  </constructorsynopsis>
   <para>
    Procedural style
   </para>
diff --git a/reference/intl/messageformatter/format-message.xml b/reference/intl/messageformatter/format-message.xml
index af50e1d186..8325c03a16 100755
--- a/reference/intl/messageformatter/format-message.xml
+++ b/reference/intl/messageformatter/format-message.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="messageformatter.formatmessage">
  <refnamediv>
   <refname>MessageFormatter::formatMessage</refname>
@@ -12,19 +12,14 @@
   <para>
    Object oriented style
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>MessageFormatter</classname>
-   </ooclass>
-   <methodsynopsis>
-    <modifier>static</modifier>
-    <type>string</type>
-    <methodname>formatMessage</methodname>
-    <methodparam><type>string</type><parameter>locale</parameter></methodparam>
-    <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
-    <methodparam><type>array</type><parameter>args</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <modifier>static</modifier>
+   <type>string</type>
+   <methodname>MessageFormatter::formatMessage</methodname>
+   <methodparam><type>string</type><parameter>locale</parameter></methodparam>
+   <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
+   <methodparam><type>array</type><parameter>args</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Procedural style
   </para>
diff --git a/reference/intl/messageformatter/format.xml b/reference/intl/messageformatter/format.xml
index d2d28b65e7..7a1e7e4116 100644
--- a/reference/intl/messageformatter/format.xml
+++ b/reference/intl/messageformatter/format.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="messageformatter.format">
  <refnamediv>
   <refname>MessageFormatter::format</refname>
@@ -12,16 +12,11 @@
   <para>
    Object oriented style
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>MessageFormatter</classname>
-   </ooclass>
-   <methodsynopsis>
-    <type>string</type>
-    <methodname>format</methodname>
-    <methodparam><type>array</type><parameter>args</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>string</type>
+   <methodname>MessageFormatter::format</methodname>
+   <methodparam><type>array</type><parameter>args</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Procedural style
   </para>
diff --git a/reference/intl/messageformatter/get-error-code.xml b/reference/intl/messageformatter/get-error-code.xml
index 70eaa7833d..921e25225e 100755
--- a/reference/intl/messageformatter/get-error-code.xml
+++ b/reference/intl/messageformatter/get-error-code.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="messageformatter.geterrorcode">
  <refnamediv>
   <refname>MessageFormatter::getErrorCode</refname>
@@ -12,16 +12,11 @@
   <para>
    Object oriented style
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>MessageFormatter</classname>
-   </ooclass>
-   <methodsynopsis>
-    <type>integer</type>
-    <methodname>getErrorCode</methodname>
-    <void />
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>integer</type>
+   <methodname>MessageFormatter::getErrorCode</methodname>
+   <void />
+  </methodsynopsis>
   <para>
    Procedural style
   </para>
diff --git a/reference/intl/messageformatter/get-error-message.xml b/reference/intl/messageformatter/get-error-message.xml
index efa23218c1..77307f7cb1 100644
--- a/reference/intl/messageformatter/get-error-message.xml
+++ b/reference/intl/messageformatter/get-error-message.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="messageformatter.geterrormessage">
  <refnamediv>
   <refname>MessageFormatter::getErrorMessage</refname>
@@ -12,16 +12,11 @@
   <para>
    Object oriented style
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>MessageFormatter</classname>
-   </ooclass>
-   <methodsynopsis>
-    <type>string</type>
-    <methodname>getErrorMessage</methodname>
-    <void />
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>string</type>
+   <methodname>MessageFormatter::getErrorMessage</methodname>
+   <void />
+  </methodsynopsis>
   <para>
    Procedural style
   </para>
diff --git a/reference/intl/messageformatter/get-locale.xml b/reference/intl/messageformatter/get-locale.xml
index 876216de82..96d199e83f 100644
--- a/reference/intl/messageformatter/get-locale.xml
+++ b/reference/intl/messageformatter/get-locale.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="messageformatter.getlocale">
  <refnamediv>
   <refname>MessageFormatter::getLocale</refname>
@@ -12,16 +12,11 @@
   <para>
    Object oriented style
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>MessageFormatter</classname>
-   </ooclass>
-   <methodsynopsis>
-    <type>string</type>
-    <methodname>getLocale</methodname>
-    <void />
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>string</type>
+   <methodname>MessageFormatter::getLocale</methodname>
+   <void />
+  </methodsynopsis>
   <para>
    Procedural style
   </para>
diff --git a/reference/intl/messageformatter/get-pattern.xml b/reference/intl/messageformatter/get-pattern.xml
index b6d81ab401..c2188df35e 100644
--- a/reference/intl/messageformatter/get-pattern.xml
+++ b/reference/intl/messageformatter/get-pattern.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="messageformatter.getpattern">
  <refnamediv>
   <refname>MessageFormatter::getPattern</refname>
@@ -12,16 +12,11 @@
   <para>
    Object oriented style
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>MessageFormatter</classname>
-   </ooclass>
-   <methodsynopsis>
-    <type>string</type>
-    <methodname>getPattern</methodname>
-    <void />
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>string</type>
+   <methodname>MessageFormatter::getPattern</methodname>
+   <void />
+  </methodsynopsis>
   <para>
    Procedural style
   </para>
diff --git a/reference/intl/messageformatter/parse-message.xml b/reference/intl/messageformatter/parse-message.xml
index a9986e1bb9..d833e3ec79 100644
--- a/reference/intl/messageformatter/parse-message.xml
+++ b/reference/intl/messageformatter/parse-message.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="messageformatter.parsemessage">
  <refnamediv>
   <refname>MessageFormatter::parseMessage</refname>
@@ -12,18 +12,13 @@
   <para>
    Object oriented style
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>MessageFormatter</classname>
-   </ooclass>
-   <methodsynopsis>
-    <modifier>static</modifier>
-    <type>array</type>
-    <methodname>parseMessage</methodname>
-    <methodparam><type>string</type><parameter>locale</parameter></methodparam>
-    <methodparam><type>string</type><parameter>value</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <modifier>static</modifier>
+   <type>array</type>
+   <methodname>MessageFormatter::parseMessage</methodname>
+   <methodparam><type>string</type><parameter>locale</parameter></methodparam>
+   <methodparam><type>string</type><parameter>value</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Procedural style
   </para>
diff --git a/reference/intl/messageformatter/parse.xml b/reference/intl/messageformatter/parse.xml
index a41fccc00e..b7c78a49d1 100644
--- a/reference/intl/messageformatter/parse.xml
+++ b/reference/intl/messageformatter/parse.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="messageformatter.parse">
  <refnamediv>
   <refname>MessageFormatter::parse</refname>
@@ -12,16 +12,11 @@
   <para>
    Object oriented style
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>MessageFormatter</classname>
-   </ooclass>
-   <methodsynopsis>
-    <type>array</type>
-    <methodname>parse</methodname>
-    <methodparam><type>string</type><parameter>value</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>array</type>
+   <methodname>MessageFormatter::parse</methodname>
+   <methodparam><type>string</type><parameter>value</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Procedural style
   </para>
diff --git a/reference/intl/messageformatter/set-pattern.xml b/reference/intl/messageformatter/set-pattern.xml
index 7040d6399c..a4da593e99 100644
--- a/reference/intl/messageformatter/set-pattern.xml
+++ b/reference/intl/messageformatter/set-pattern.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="messageformatter.setpattern">
  <refnamediv>
   <refname>MessageFormatter::setPattern</refname>
@@ -12,16 +12,11 @@
   <para>
    Object oriented style
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>MessageFormatter</classname>
-   </ooclass>
-   <methodsynopsis>
-    <type>boolean</type>
-    <methodname>setPattern</methodname>
-    <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>boolean</type>
+   <methodname>MessageFormatter::setPattern</methodname>
+   <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Procedural style
   </para>
diff --git a/reference/intl/normalizer/is-normalized.xml b/reference/intl/normalizer/is-normalized.xml
index 0f9ce26723..fb58c247f0 100755
--- a/reference/intl/normalizer/is-normalized.xml
+++ b/reference/intl/normalizer/is-normalized.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="normalizer.isnormalized">
  <refnamediv>
   <refname>Normalizer::isNormalized</refname>
@@ -12,18 +12,13 @@
   <para>
    Object oriented style
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>Normalizer</classname>
-   </ooclass>
-   <methodsynopsis>
-    <modifier>static</modifier>
-    <type>boolean</type>
-    <methodname>isNormalized</methodname>
-    <methodparam><type>string</type><parameter>input</parameter></methodparam>
-    <methodparam choice="opt"><type>string</type><parameter>form</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <modifier>static</modifier>
+   <type>boolean</type>
+   <methodname>Normalizer::isNormalized</methodname>
+   <methodparam><type>string</type><parameter>input</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>form</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Procedural style
   </para>
diff --git a/reference/intl/normalizer/normalize.xml b/reference/intl/normalizer/normalize.xml
index 9fd9c976d6..8827b034e3 100755
--- a/reference/intl/normalizer/normalize.xml
+++ b/reference/intl/normalizer/normalize.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="normalizer.normalize">
  <refnamediv>
   <refname>Normalizer::normalize</refname>
@@ -12,18 +12,13 @@
   <para>
    Object oriented style
   </para>
-  <classsynopsis>
-   <ooclass>
-    <classname>Normalizer</classname>
-   </ooclass>
-   <methodsynopsis>
-    <modifier>static</modifier>
-    <type>string</type>
-    <methodname>normalize</methodname>
-    <methodparam><type>string</type><parameter>input</parameter></methodparam>
-    <methodparam choice="opt"><type>string</type><parameter>form</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <modifier>static</modifier>
+   <type>string</type>
+   <methodname>Normalizer::normalize</methodname>
+   <methodparam><type>string</type><parameter>input</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>form</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Procedural style
   </para>