diff --git a/reference/intl/uconverter.xml b/reference/intl/uconverter.xml
index 5f161955f1..650ff83d1d 100644
--- a/reference/intl/uconverter.xml
+++ b/reference/intl/uconverter.xml
@@ -280,6 +280,7 @@
     </fieldsynopsis>
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.uconverter')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[1])" />
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.uconverter')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/intl/uconverter/construct.xml b/reference/intl/uconverter/construct.xml
index 0e065f7aa9..1e938c059c 100644
--- a/reference/intl/uconverter/construct.xml
+++ b/reference/intl/uconverter/construct.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="uconverter.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>UConverter::__construct</refname>
@@ -9,11 +8,11 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>UConverter::__construct</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>destination_encoding</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>source_encoding</parameter></methodparam>
-  </methodsynopsis>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>destination_encoding</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>source_encoding</parameter><initializer>&null;</initializer></methodparam>
+  </constructorsynopsis>
   <para>
 
   </para>
@@ -53,7 +52,6 @@
 
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/uconverter/convert.xml b/reference/intl/uconverter/convert.xml
index 93ec28f596..8950aeb208 100644
--- a/reference/intl/uconverter/convert.xml
+++ b/reference/intl/uconverter/convert.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="uconverter.convert" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>UConverter::convert</refname>
@@ -10,9 +9,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>UConverter::convert</methodname>
+   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>UConverter::convert</methodname>
    <methodparam><type>string</type><parameter>str</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>reverse</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>reverse</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
   <para>
 
@@ -53,7 +52,6 @@
 
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/uconverter/fromucallback.xml b/reference/intl/uconverter/fromucallback.xml
index a827925867..87c76793a0 100644
--- a/reference/intl/uconverter/fromucallback.xml
+++ b/reference/intl/uconverter/fromucallback.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="uconverter.fromucallback" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>UConverter::fromUCallback</refname>
@@ -10,10 +9,10 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>UConverter::fromUCallback</methodname>
+   <modifier>public</modifier> <type class="union"><type>string</type><type>int</type><type>array</type><type>null</type></type><methodname>UConverter::fromUCallback</methodname>
    <methodparam><type>int</type><parameter>reason</parameter></methodparam>
-   <methodparam><type>string</type><parameter>source</parameter></methodparam>
-   <methodparam><type>string</type><parameter>codePoint</parameter></methodparam>
+   <methodparam><type>array</type><parameter>source</parameter></methodparam>
+   <methodparam><type>int</type><parameter>codePoint</parameter></methodparam>
    <methodparam><type>int</type><parameter role="reference">error</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -71,7 +70,6 @@
 
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/uconverter/getaliases.xml b/reference/intl/uconverter/getaliases.xml
index 95ab8f9e27..dadd13e478 100644
--- a/reference/intl/uconverter/getaliases.xml
+++ b/reference/intl/uconverter/getaliases.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="uconverter.getaliases" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>UConverter::getAliases</refname>
@@ -10,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>array</type><methodname>UConverter::getAliases</methodname>
+   <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>array</type><type>false</type><type>null</type></type><methodname>UConverter::getAliases</methodname>
    <methodparam><type>string</type><parameter>name</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -44,7 +43,6 @@
 
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/uconverter/getdestinationencoding.xml b/reference/intl/uconverter/getdestinationencoding.xml
index 4df18d46a0..b9c1aee211 100644
--- a/reference/intl/uconverter/getdestinationencoding.xml
+++ b/reference/intl/uconverter/getdestinationencoding.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="uconverter.getdestinationencoding" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>UConverter::getDestinationEncoding</refname>
@@ -10,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>UConverter::getDestinationEncoding</methodname>
-   <void />
+   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type><type>null</type></type><methodname>UConverter::getDestinationEncoding</methodname>
+   <void/>
   </methodsynopsis>
   <para>
 
@@ -35,7 +34,6 @@
 
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/uconverter/getdestinationtype.xml b/reference/intl/uconverter/getdestinationtype.xml
index ccb79c4e73..4652545641 100644
--- a/reference/intl/uconverter/getdestinationtype.xml
+++ b/reference/intl/uconverter/getdestinationtype.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="uconverter.getdestinationtype" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>UConverter::getDestinationType</refname>
@@ -10,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>UConverter::getDestinationType</methodname>
-   <void />
+   <modifier>public</modifier> <type class="union"><type>int</type><type>false</type><type>null</type></type><methodname>UConverter::getDestinationType</methodname>
+   <void/>
   </methodsynopsis>
   <para>
 
@@ -35,7 +34,6 @@
 
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/uconverter/geterrormessage.xml b/reference/intl/uconverter/geterrormessage.xml
index 04a08be72a..ad9744d754 100644
--- a/reference/intl/uconverter/geterrormessage.xml
+++ b/reference/intl/uconverter/geterrormessage.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="uconverter.geterrormessage" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>UConverter::getErrorMessage</refname>
@@ -10,9 +9,9 @@
  <refsect1 role="description">
   &reftitle.description;
    <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>UConverter::getErrorMessage</methodname>
-   <void />
-   </methodsynopsis>
+   <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>UConverter::getErrorMessage</methodname>
+   <void/>
+  </methodsynopsis>
   <para>
 
   </para>
@@ -35,7 +34,6 @@
 
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/uconverter/getsourceencoding.xml b/reference/intl/uconverter/getsourceencoding.xml
index c0b0eab931..5d8ed00a11 100644
--- a/reference/intl/uconverter/getsourceencoding.xml
+++ b/reference/intl/uconverter/getsourceencoding.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="uconverter.getsourceencoding" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>UConverter::getSourceEncoding</refname>
@@ -10,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>UConverter::getSourceEncoding</methodname>
-   <void />
+   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type><type>null</type></type><methodname>UConverter::getSourceEncoding</methodname>
+   <void/>
   </methodsynopsis>
   <para>
 
@@ -35,7 +34,6 @@
 
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/uconverter/getsourcetype.xml b/reference/intl/uconverter/getsourcetype.xml
index a8a72df435..60a28b41a8 100644
--- a/reference/intl/uconverter/getsourcetype.xml
+++ b/reference/intl/uconverter/getsourcetype.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="uconverter.getsourcetype" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>UConverter::getSourceType</refname>
@@ -10,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>UConverter::getSourceType</methodname>
-   <void />
+   <modifier>public</modifier> <type class="union"><type>int</type><type>false</type><type>null</type></type><methodname>UConverter::getSourceType</methodname>
+   <void/>
   </methodsynopsis>
   <para>
 
@@ -35,7 +34,6 @@
 
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/uconverter/getstandards.xml b/reference/intl/uconverter/getstandards.xml
index 956615a29e..56e08999a1 100644
--- a/reference/intl/uconverter/getstandards.xml
+++ b/reference/intl/uconverter/getstandards.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="uconverter.getstandards" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>UConverter::getStandards</refname>
@@ -10,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>array</type><methodname>UConverter::getStandards</methodname>
-   <void />
+   <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>array</type><type>null</type></type><methodname>UConverter::getStandards</methodname>
+   <void/>
   </methodsynopsis>
   <para>
 
@@ -35,7 +34,6 @@
 
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/uconverter/getsubstchars.xml b/reference/intl/uconverter/getsubstchars.xml
index e193f6127b..1b1255c324 100644
--- a/reference/intl/uconverter/getsubstchars.xml
+++ b/reference/intl/uconverter/getsubstchars.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="uconverter.getsubstchars" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>UConverter::getSubstChars</refname>
@@ -10,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>UConverter::getSubstChars</methodname>
-   <void />
+   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type><type>null</type></type><methodname>UConverter::getSubstChars</methodname>
+   <void/>
   </methodsynopsis>
   <para>
 
@@ -35,7 +34,6 @@
 
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/uconverter/reasontext.xml b/reference/intl/uconverter/reasontext.xml
index efec8b3839..e69fa36c0a 100644
--- a/reference/intl/uconverter/reasontext.xml
+++ b/reference/intl/uconverter/reasontext.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="uconverter.reasontext" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>UConverter::reasonText</refname>
@@ -11,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <modifier>static</modifier> <type>string</type><methodname>UConverter::reasonText</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>reason</parameter></methodparam>
+   <methodparam><type>int</type><parameter>reason</parameter></methodparam>
   </methodsynopsis>
   <para>
 
@@ -44,7 +43,6 @@
 
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/uconverter/setdestinationencoding.xml b/reference/intl/uconverter/setdestinationencoding.xml
index c4e24d98e3..7c2fc370d5 100644
--- a/reference/intl/uconverter/setdestinationencoding.xml
+++ b/reference/intl/uconverter/setdestinationencoding.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="uconverter.setdestinationencoding" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>UConverter::setDestinationEncoding</refname>
@@ -10,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>UConverter::setDestinationEncoding</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>UConverter::setDestinationEncoding</methodname>
    <methodparam><type>string</type><parameter>encoding</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -44,7 +43,6 @@
 
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/uconverter/setsourceencoding.xml b/reference/intl/uconverter/setsourceencoding.xml
index e22b4e26cb..e75db4aadd 100644
--- a/reference/intl/uconverter/setsourceencoding.xml
+++ b/reference/intl/uconverter/setsourceencoding.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="uconverter.setsourceencoding" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>UConverter::setSourceEncoding</refname>
@@ -10,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>UConverter::setSourceEncoding</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>UConverter::setSourceEncoding</methodname>
    <methodparam><type>string</type><parameter>encoding</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -44,7 +43,6 @@
 
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/uconverter/setsubstchars.xml b/reference/intl/uconverter/setsubstchars.xml
index 2f20fbcaac..af977cb5ae 100644
--- a/reference/intl/uconverter/setsubstchars.xml
+++ b/reference/intl/uconverter/setsubstchars.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="uconverter.setsubstchars" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>UConverter::setSubstChars</refname>
@@ -10,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>UConverter::setSubstChars</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>UConverter::setSubstChars</methodname>
    <methodparam><type>string</type><parameter>chars</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -44,7 +43,6 @@
 
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/uconverter/toucallback.xml b/reference/intl/uconverter/toucallback.xml
index aea37fdb2a..e091aeadd1 100644
--- a/reference/intl/uconverter/toucallback.xml
+++ b/reference/intl/uconverter/toucallback.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="uconverter.toucallback" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>UConverter::toUCallback</refname>
@@ -10,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>UConverter::toUCallback</methodname>
+   <modifier>public</modifier> <type class="union"><type>string</type><type>int</type><type>array</type><type>null</type></type><methodname>UConverter::toUCallback</methodname>
    <methodparam><type>int</type><parameter>reason</parameter></methodparam>
    <methodparam><type>string</type><parameter>source</parameter></methodparam>
    <methodparam><type>string</type><parameter>codeUnits</parameter></methodparam>
@@ -71,7 +70,6 @@
 
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/uconverter/transcode.xml b/reference/intl/uconverter/transcode.xml
index cbfe49f76c..10b4710cc1 100644
--- a/reference/intl/uconverter/transcode.xml
+++ b/reference/intl/uconverter/transcode.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="uconverter.transcode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>UConverter::transcode</refname>
@@ -10,11 +9,11 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>string</type><methodname>UConverter::transcode</methodname>
+   <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>UConverter::transcode</methodname>
    <methodparam><type>string</type><parameter>str</parameter></methodparam>
    <methodparam><type>string</type><parameter>toEncoding</parameter></methodparam>
    <methodparam><type>string</type><parameter>fromEncoding</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
 
@@ -71,7 +70,6 @@
 
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml