diff --git a/reference/intl/dateformatter.xml b/reference/intl/dateformatter.xml
index 38a6a144e7..092ad5f0e0 100644
--- a/reference/intl/dateformatter.xml
+++ b/reference/intl/dateformatter.xml
@@ -40,9 +40,9 @@
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include
-     xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.intldateformatter')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[1])" />
+     xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.intldateformatter')/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.intldateformatter')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+     xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.intldateformatter')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
    </classsynopsis>
    <!-- }}} -->
 
diff --git a/reference/intl/dateformatter/create.xml b/reference/intl/dateformatter/create.xml
index 9998369c96..efe62c2c52 100644
--- a/reference/intl/dateformatter/create.xml
+++ b/reference/intl/dateformatter/create.xml
@@ -12,40 +12,37 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>IntlDateFormatter</type><methodname>IntlDateFormatter::create</methodname>
-   <methodparam><type>string</type><parameter>locale</parameter></methodparam>
-   <methodparam><type>int</type><parameter>datetype</parameter></methodparam>
-   <methodparam><type>int</type><parameter>timetype</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>timezone</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>calendar</parameter><initializer>NULL</initializer></methodparam>
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>IntlDateFormatter</type><type>null</type></type><methodname>IntlDateFormatter::create</methodname>
+   <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>locale</parameter></methodparam>
+   <methodparam><type>int</type><parameter>dateType</parameter></methodparam>
+   <methodparam><type>int</type><parameter>timeType</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>IntlTimeZone</type><type>DateTimeZone</type><type>string</type><type>null</type></type><parameter>timezone</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>IntlCalendar</type><type>int</type><type>null</type></type><parameter>calendar</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>pattern</parameter><initializer>""</initializer></methodparam>
   </methodsynopsis>
   <para>
    &style.oop; (constructor)
   </para>
   <constructorsynopsis>
-   <modifier>public</modifier>
-   <methodname>IntlDateFormatter::__construct</methodname>
-   <methodparam><type>string</type><parameter>locale</parameter></methodparam>
-   <methodparam><type>int</type><parameter>datetype</parameter></methodparam>
-   <methodparam><type>int</type><parameter>timetype</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>timezone</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>calendar</parameter><initializer>NULL</initializer></methodparam>
+   <modifier>public</modifier> <methodname>IntlDateFormatter::__construct</methodname>
+   <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>locale</parameter></methodparam>
+   <methodparam><type>int</type><parameter>dateType</parameter></methodparam>
+   <methodparam><type>int</type><parameter>timeType</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>IntlTimeZone</type><type>DateTimeZone</type><type>string</type><type>null</type></type><parameter>timezone</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>IntlCalendar</type><type>int</type><type>null</type></type><parameter>calendar</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>pattern</parameter><initializer>""</initializer></methodparam>
   </constructorsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>IntlDateFormatter</type><methodname>datefmt_create</methodname>
-   <methodparam><type>string</type><parameter>locale</parameter></methodparam>
-   <methodparam><type>int</type><parameter>datetype</parameter></methodparam>
-   <methodparam><type>int</type><parameter>timetype</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>timezone</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>calendar</parameter><initializer>NULL</initializer></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>IntlDateFormatter</type><type>null</type></type><methodname>datefmt_create</methodname>
+   <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>locale</parameter></methodparam>
+   <methodparam><type>int</type><parameter>dateType</parameter></methodparam>
+   <methodparam><type>int</type><parameter>timeType</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>IntlTimeZone</type><type>DateTimeZone</type><type>string</type><type>null</type></type><parameter>timezone</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>IntlCalendar</type><type>int</type><type>null</type></type><parameter>calendar</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>pattern</parameter><initializer>""</initializer></methodparam>
   </methodsynopsis>
   <para>
@@ -68,7 +65,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>datetype</parameter></term>
+     <term><parameter>dateType</parameter></term>
      <listitem>
       <para>
        Date type to use (<constant>none</constant>, <constant>short</constant>,
@@ -81,7 +78,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>timetype</parameter></term>
+     <term><parameter>timeType</parameter></term>
      <listitem>
       <para>
        Time type to use (<constant>none</constant>, <constant>short</constant>,
@@ -146,7 +143,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The created <classname>IntlDateFormatter</classname> or &false; in case of
+   The created <classname>IntlDateFormatter</classname> or &null; in case of
    failure.
   </para>
  </refsect1>
@@ -261,7 +258,6 @@ Second Formatted output with pattern is 12/31/1969
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/format.xml b/reference/intl/dateformatter/format.xml
index 0d54cc5dc6..63a64f6cf9 100644
--- a/reference/intl/dateformatter/format.xml
+++ b/reference/intl/dateformatter/format.xml
@@ -11,17 +11,17 @@
   <para>
    &style.oop;
   </para>
-   <methodsynopsis>
-    <modifier>public</modifier> <type>string</type><methodname>IntlDateFormatter::format</methodname>
-    <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-   </methodsynopsis>
+   <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>IntlDateFormatter::format</methodname>
+   <methodparam><type class="union"><type>IntlCalendar</type><type>DateTimeInterface</type><type>array</type><type>string</type><type>int</type><type>float</type></type><parameter>datetime</parameter></methodparam>
+  </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>string</type><methodname>datefmt_format</methodname>
-  <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
-  <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>string</type><type>false</type></type><methodname>datefmt_format</methodname>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
+   <methodparam><type class="union"><type>IntlCalendar</type><type>DateTimeInterface</type><type>array</type><type>string</type><type>int</type><type>float</type></type><parameter>datetime</parameter></methodparam>
   </methodsynopsis>
   <para>
    Formats the time value as a string.
@@ -33,7 +33,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        The date formatter resource.
@@ -41,7 +41,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>value</parameter></term>
+     <term><parameter>datetime</parameter></term>
      <listitem>
       <para>
        Value to format. This may be a <classname>DateTimeInterface</classname> object, an
@@ -89,7 +89,7 @@
        <entry>7.1.5</entry>
        <entry>
         Support for providing general <classname>DateTimeInterface</classname> objects to the
-        <parameter>value</parameter> parameter was added. Formerly, only proper
+        <parameter>datetime</parameter> parameter was added. Formerly, only proper
         <classname>DateTime</classname> objects were supported.
        </entry>
       </row>
@@ -97,7 +97,7 @@
        <entry>PECL 3.0.0</entry>
        <entry>
         Support for providing <classname>IntlCalendar</classname> objects to the
-        <parameter>value</parameter> parameter was added.
+        <parameter>datetime</parameter> parameter was added.
        </entry>
       </row>
      </tbody>
@@ -269,7 +269,6 @@ After changing timezone:
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/formatobject.xml b/reference/intl/dateformatter/formatobject.xml
index b705e01e2d..fe171ca55f 100644
--- a/reference/intl/dateformatter/formatobject.xml
+++ b/reference/intl/dateformatter/formatobject.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="intldateformatter.formatobject" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>IntlDateFormatter::formatObject</refname>
@@ -13,21 +12,20 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
+  <methodsynopsis role="oop">
    <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>IntlDateFormatter::formatObject</methodname>
-   <methodparam><type>object</type><parameter>object</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>format</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>locale</parameter><initializer>NULL</initializer></methodparam>
+   <methodparam><type class="union"><type>IntlCalendar</type><type>DateTime</type></type><parameter>datetime</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>array</type><type>int</type><type>string</type><type>null</type></type><parameter>format</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>locale</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier>
+  <methodsynopsis role="procedural">
    <type class="union"><type>string</type><type>false</type></type><methodname>datefmt_format_object</methodname>
-   <methodparam><type>object</type><parameter>object</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>format</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>locale</parameter><initializer>NULL</initializer></methodparam>
+   <methodparam><type class="union"><type>IntlCalendar</type><type>DateTimeInterface</type></type><parameter>datetime</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>array</type><type>int</type><type>string</type><type>null</type></type><parameter>format</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>locale</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   
   <para>
@@ -49,7 +47,7 @@
   &reftitle.parameters;
   <variablelist>
    <varlistentry>
-    <term><parameter>object</parameter></term>
+    <term><parameter>datetime</parameter></term>
     <listitem>
      <para>
       An object of type <classname>IntlCalendar</classname> or
@@ -158,7 +156,6 @@ with DateTime:
  </refsect1>
  
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/get-calendar.xml b/reference/intl/dateformatter/get-calendar.xml
index 97166b05e0..20f47261cd 100644
--- a/reference/intl/dateformatter/get-calendar.xml
+++ b/reference/intl/dateformatter/get-calendar.xml
@@ -11,16 +11,16 @@
   <para>
    &style.oop;
   </para>
-   <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>IntlDateFormatter::getCalendar</methodname>
-   <void />
-   </methodsynopsis>
+   <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>int</type><type>false</type></type><methodname>IntlDateFormatter::getCalendar</methodname>
+   <void/>
+  </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>int</type><methodname>datefmt_get_calendar</methodname>
-  <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>int</type><type>false</type></type><methodname>datefmt_get_calendar</methodname>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
   </methodsynopsis>
   <para>
   </para> 
@@ -31,7 +31,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        The formatter resource      
@@ -50,6 +50,7 @@
    type</link> being used by the formatter. Either
    <constant>IntlDateFormatter::TRADITIONAL</constant> or
    <constant>IntlDateFormatter::GREGORIAN</constant>.
+   Returns &false; on failure.
   </para>
  </refsect1>
  
@@ -114,7 +115,6 @@ Now calendar of the formatter is : 0
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/get-datetype.xml b/reference/intl/dateformatter/get-datetype.xml
index 1488c1edcf..b92105882b 100644
--- a/reference/intl/dateformatter/get-datetype.xml
+++ b/reference/intl/dateformatter/get-datetype.xml
@@ -11,16 +11,16 @@
   <para>
    &style.oop;
   </para>
-   <methodsynopsis>
-    <modifier>public</modifier> <type>int</type><methodname>IntlDateFormatter::getDateType</methodname>
-    <void />
-   </methodsynopsis>
+   <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>int</type><type>false</type></type><methodname>IntlDateFormatter::getDateType</methodname>
+   <void/>
+  </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>int</type><methodname>datefmt_get_datetype</methodname>
-  <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>int</type><type>false</type></type><methodname>datefmt_get_datetype</methodname>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
   </methodsynopsis>
   <para>
      Returns date type used by the formatter.
@@ -32,7 +32,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        The formatter resource.
@@ -47,7 +47,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The current <link linkend="intl.intldateformatter-constants">date type</link> value of the formatter.
+   The current <link linkend="intl.intldateformatter-constants">date type</link> value of the formatter,
+   &return.falseforfailure;.
   </para>
  </refsect1>
  
@@ -131,7 +132,6 @@ Second Formatted output is 12/31/69 4:00:00 PM PT
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/get-error-code.xml b/reference/intl/dateformatter/get-error-code.xml
index 9e3b397532..101dedd4e8 100644
--- a/reference/intl/dateformatter/get-error-code.xml
+++ b/reference/intl/dateformatter/get-error-code.xml
@@ -11,16 +11,16 @@
   <para>
    &style.oop;
   </para>
-   <methodsynopsis>
-    <modifier>public</modifier> <type>int</type><methodname>IntlDateFormatter::getErrorCode</methodname>
-    <void />
-   </methodsynopsis>
+   <methodsynopsis role="oop">
+   <modifier>public</modifier> <type>int</type><methodname>IntlDateFormatter::getErrorCode</methodname>
+   <void/>
+  </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
+  <methodsynopsis role="procedural">
    <type>int</type><methodname>datefmt_get_error_code</methodname>
-  <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
   </methodsynopsis>
   <para>
    Get the error code from last operation.
@@ -33,7 +33,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        The formatter resource.      
@@ -121,7 +121,6 @@ ERROR: U_ZERO_ERROR (0)
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/get-error-message.xml b/reference/intl/dateformatter/get-error-message.xml
index d0f44b4ea6..2bb628d52f 100644
--- a/reference/intl/dateformatter/get-error-message.xml
+++ b/reference/intl/dateformatter/get-error-message.xml
@@ -11,16 +11,16 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
+  <methodsynopsis role="oop">
    <modifier>public</modifier> <type>string</type><methodname>IntlDateFormatter::getErrorMessage</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
+  <methodsynopsis role="procedural">
    <type>string</type><methodname>datefmt_get_error_message</methodname>
-   <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
   </methodsynopsis>
   <para>
    Get the error text from the last operation.  
@@ -32,7 +32,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        The formatter resource.      
@@ -121,7 +121,6 @@ ERROR: U_ZERO_ERROR (0)
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/get-locale.xml b/reference/intl/dateformatter/get-locale.xml
index b1f0d77f2c..cf8b200800 100644
--- a/reference/intl/dateformatter/get-locale.xml
+++ b/reference/intl/dateformatter/get-locale.xml
@@ -11,17 +11,17 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>IntlDateFormatter::getLocale</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>which</parameter></methodparam>
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>IntlDateFormatter::getLocale</methodname>
+   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer><constant>ULOC_ACTUAL_LOCALE</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>string</type><methodname>datefmt_get_locale</methodname>
-   <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>which</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>string</type><type>false</type></type><methodname>datefmt_get_locale</methodname>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer><constant>ULOC_ACTUAL_LOCALE</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
    Get locale used by the formatter.
@@ -33,7 +33,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        The formatter resource      
@@ -41,7 +41,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>which</parameter></term>
+     <term><parameter>type</parameter></term>
      <listitem>
       <para>
        You can choose between valid and actual locale (
@@ -59,7 +59,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   the locale of this formatter  or 'false' if error  
+   The locale of this formatter, &return.falseforfailure;.
   </para>
  </refsect1>
  
@@ -143,7 +143,6 @@ Second Formatted output is Mittwoch, 31. Dezember 1969 16:00 Uhr GMT-08:00
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/get-pattern.xml b/reference/intl/dateformatter/get-pattern.xml
index 6e948fba92..5eb6d0ade0 100644
--- a/reference/intl/dateformatter/get-pattern.xml
+++ b/reference/intl/dateformatter/get-pattern.xml
@@ -11,16 +11,16 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>IntlDateFormatter::getPattern</methodname>
-   <void />
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>IntlDateFormatter::getPattern</methodname>
+   <void/>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>string</type><methodname>datefmt_get_pattern</methodname>
-   <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>string</type><type>false</type></type><methodname>datefmt_get_pattern</methodname>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
   </methodsynopsis>
   <para>
    Get pattern used by the formatter.
@@ -32,7 +32,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        The formatter resource.      
@@ -47,7 +47,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The pattern string being used to format/parse.  
+   The pattern string being used to format/parse, &return.falseforfailure;.
   </para>
  </refsect1>
  
@@ -119,7 +119,6 @@ Second Formatted output is 19690031 04:00:00 PST
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/get-timetype.xml b/reference/intl/dateformatter/get-timetype.xml
index e72c903542..b54c3cf976 100644
--- a/reference/intl/dateformatter/get-timetype.xml
+++ b/reference/intl/dateformatter/get-timetype.xml
@@ -11,16 +11,16 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>IntlDateFormatter::getTimeType</methodname>
-   <void />
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>int</type><type>false</type></type><methodname>IntlDateFormatter::getTimeType</methodname>
+   <void/>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>int</type><methodname>datefmt_get_timetype</methodname>
-   <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>int</type><type>false</type></type><methodname>datefmt_get_timetype</methodname>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
   </methodsynopsis>
   <para>
    Return time type used by the formatter.
@@ -32,7 +32,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        The formatter resource.      
@@ -47,7 +47,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   The current <link linkend="intl.intldateformatter-constants">date type</link> value of the formatter.
+   The current <link linkend="intl.intldateformatter-constants">date type</link> value of the formatter,
+   &return.falseforfailure;.
   </para>
  </refsect1>
  
@@ -132,7 +133,6 @@ Second Formatted output is Wednesday, December 31, 1969 4:00 PM
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/get-timezone-id.xml b/reference/intl/dateformatter/get-timezone-id.xml
index f73c0ba1de..f42286dc72 100644
--- a/reference/intl/dateformatter/get-timezone-id.xml
+++ b/reference/intl/dateformatter/get-timezone-id.xml
@@ -11,16 +11,16 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>IntlDateFormatter::getTimeZoneId</methodname>
-   <void />
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>IntlDateFormatter::getTimeZoneId</methodname>
+   <void/>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>string</type><methodname>datefmt_get_timezone_id</methodname>
-   <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>string</type><type>false</type></type><methodname>datefmt_get_timezone_id</methodname>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
   </methodsynopsis>
   <para>
    Get the timezone-id used for the IntlDateFormatter.
@@ -32,7 +32,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        The formatter resource.      
@@ -47,7 +47,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   ID string for the time zone used by this formatter.  
+   ID string for the time zone used by this formatter, &return.falseforfailure;.
   </para>
  </refsect1>
  
@@ -112,7 +112,6 @@ Now timezone_id of the formatter is : CN
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/getcalendarobject.xml b/reference/intl/dateformatter/getcalendarobject.xml
index a522a4b909..45d035a606 100644
--- a/reference/intl/dateformatter/getcalendarobject.xml
+++ b/reference/intl/dateformatter/getcalendarobject.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="intldateformatter.getcalendarobject" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>IntlDateFormatter::getCalendarObject</refname>
@@ -13,19 +12,16 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>IntlCalendar</type>
-   <methodname>IntlDateFormatter::getCalendarObject</methodname>
-   <void />
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>IntlCalendar</type><type>false</type><type>null</type></type><methodname>IntlDateFormatter::getCalendarObject</methodname>
+   <void/>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>IntlCalendar</type>
-   <methodname>datefmt_get_calendar_object</methodname>
-   <void />
+  <methodsynopsis role="procedural">
+   <type class="union"><type>IntlCalendar</type><type>false</type><type>null</type></type><methodname>datefmt_get_calendar_object</methodname>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
   </methodsynopsis>
   
   <para>
@@ -45,7 +41,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   A copy of the internal calendar object used by this formatter.
+   A copy of the internal calendar object used by this formatter,
+   or &null; if none has been set, &return.falseforfailure;.
   </para>
  </refsect1>
  
@@ -108,7 +105,6 @@ string(5) "fr_FR"
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/gettimezone.xml b/reference/intl/dateformatter/gettimezone.xml
index 93195b5e54..90d78b5fbb 100644
--- a/reference/intl/dateformatter/gettimezone.xml
+++ b/reference/intl/dateformatter/gettimezone.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="intldateformatter.gettimezone" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>IntlDateFormatter::getTimeZone</refname>
@@ -13,17 +12,16 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
+  <methodsynopsis role="oop">
    <modifier>public</modifier> <type class="union"><type>IntlTimeZone</type><type>false</type></type><methodname>IntlDateFormatter::getTimeZone</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type class="union"><type>IntlTimeZone</type><type>false</type></type>
-   <methodname>datefmt_get_timezone</methodname>
-   <void />
+  <methodsynopsis role="procedural">
+   <type class="union"><type>IntlTimeZone</type><type>false</type></type><methodname>datefmt_get_timezone</methodname>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
   </methodsynopsis>
   
   <para>
@@ -107,7 +105,6 @@ Europe/Lisbon
  </refsect1>
  
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/is-lenient.xml b/reference/intl/dateformatter/is-lenient.xml
index b856eb487c..51f97657a6 100644
--- a/reference/intl/dateformatter/is-lenient.xml
+++ b/reference/intl/dateformatter/is-lenient.xml
@@ -11,16 +11,16 @@
   <para>
    &style.oop;
   </para>
-   <methodsynopsis>
-    <modifier>public</modifier> <type>bool</type><methodname>IntlDateFormatter::isLenient</methodname>
-    <void />
-   </methodsynopsis>
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type>bool</type><methodname>IntlDateFormatter::isLenient</methodname>
+   <void/>
+  </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
+  <methodsynopsis role="procedural">
    <type>bool</type><methodname>datefmt_is_lenient</methodname>
-  <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
   </methodsynopsis>
   <para>
     Check if the parser is strict or lenient in interpreting inputs that do not match the pattern exactly.
@@ -32,7 +32,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        The formatter resource.
@@ -165,7 +165,6 @@ Error_code is : 9
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/localtime.xml b/reference/intl/dateformatter/localtime.xml
index 11c31cb61f..a57627085e 100644
--- a/reference/intl/dateformatter/localtime.xml
+++ b/reference/intl/dateformatter/localtime.xml
@@ -11,19 +11,19 @@
   <para>
    &style.oop;
   </para>
-   <methodsynopsis>
-    <modifier>public</modifier> <type>array</type><methodname>IntlDateFormatter::localtime</methodname>
-    <methodparam><type>string</type><parameter>value</parameter></methodparam>
-    <methodparam choice="opt"><type>int</type><parameter role="reference">position</parameter></methodparam>
-   </methodsynopsis>
+   <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>array</type><type>false</type></type><methodname>IntlDateFormatter::localtime</methodname>
+   <methodparam><type>string</type><parameter>string</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter role="reference">offset</parameter><initializer>&null;</initializer></methodparam>
+  </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>array</type><methodname>datefmt_localtime</methodname>
-  <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
-  <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  <methodparam choice="opt"><type>int</type><parameter role="reference">position</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>array</type><type>false</type></type><methodname>datefmt_localtime</methodname>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
+   <methodparam><type>string</type><parameter>string</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter role="reference">offset</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Converts string $value to a field-based time value ( an array of various fields), starting at
@@ -36,7 +36,7 @@ $parse_pos and consuming as much of the input value as possible.
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        The formatter resource      
@@ -44,7 +44,7 @@ $parse_pos and consuming as much of the input value as possible.
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>value</parameter></term>
+     <term><parameter>string</parameter></term>
      <listitem>
       <para>
        string to convert to a time      
@@ -52,13 +52,13 @@ $parse_pos and consuming as much of the input value as possible.
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>position</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>
        Position at which to start the parsing in $value (zero-based).
        If no error occurs before $value is consumed, $parse_pos will contain -1
        otherwise it will contain the position at which parsing ended .
-       If $parse_pos > strlen($value), the parse fails immediately.  
+       If $parse_pos &gt; strlen($value), the parse fails immediately.  
       </para>
      </listitem>
     </varlistentry>
@@ -70,7 +70,8 @@ $parse_pos and consuming as much of the input value as possible.
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Localtime compatible array of integers  : contains 24 hour clock value in tm_hour field
+   Localtime compatible array of integers  : contains 24 hour clock value in tm_hour field,
+   &return.falseforfailure;.
    </para>
  </refsect1>
  
@@ -147,7 +148,6 @@ tm_mday : 31 , tm_wday : 4 , tm_yday : 365 , tm_mon : 11 , tm_isdst : 0 ,
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/parse.xml b/reference/intl/dateformatter/parse.xml
index bc9fd7339e..9242b56145 100644
--- a/reference/intl/dateformatter/parse.xml
+++ b/reference/intl/dateformatter/parse.xml
@@ -11,23 +11,23 @@
   <para>
    &style.oop;
   </para>
-   <methodsynopsis>
-    <modifier>public</modifier> <type>int</type><methodname>IntlDateFormatter::parse</methodname>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter role="reference">position</parameter></methodparam>
-   </methodsynopsis>
+   <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>int</type><type>float</type><type>false</type></type><methodname>IntlDateFormatter::parse</methodname>
+   <methodparam><type>string</type><parameter>string</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter role="reference">offset</parameter><initializer>&null;</initializer></methodparam>
+  </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>int</type><methodname>datefmt_parse</methodname>
-  <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
-  <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  <methodparam choice="opt"><type>int</type><parameter role="reference">position</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>int</type><type>float</type><type>false</type></type><methodname>datefmt_parse</methodname>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
+   <methodparam><type>string</type><parameter>string</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter role="reference">offset</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
-   Converts string $value to an incremental time value, starting at 
-   $parse_pos and consuming as much of the input value as possible.
+   Converts <parameter>string</parameter> to an incremental time value, starting at 
+   <parameter>offset</parameter> and consuming as much of the input value as possible.
   </para> 
   </refsect1>
 
@@ -36,7 +36,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        The formatter resource      
@@ -44,7 +44,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>value</parameter></term>
+     <term><parameter>string</parameter></term>
      <listitem>
       <para>
        string to convert to a time 
@@ -52,14 +52,14 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>position</parameter></term>
+     <term><parameter>offset</parameter></term>
      <listitem>
       <para>
-       Position at which to start the parsing in $value (zero-based).
-       If no error occurs before $value is consumed, $parse_pos will contain -1
+       Position at which to start the parsing in <parameter>string</parameter> (zero-based).
+       If no error occurs before <parameter>string</parameter> is consumed, <parameter>offset</parameter> will contain -1
        otherwise it will contain the position at which parsing ended (and the error occurred).
        This variable will contain the end position if the parse fails.
-       If $parse_pos > strlen($value), the parse fails immediately.  
+       If <parameter>offset</parameter> &gt; <code>strlen($string)</code>, the parse fails immediately.
      </para>
      </listitem>
     </varlistentry>
@@ -71,7 +71,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   timestamp parsed value, or &false; if value can't be parsed.
+   Timestamp of parsed value, or &false; if value cannot be parsed.
   </para>
  </refsect1>
  
@@ -148,7 +148,6 @@ Second parsed output is 630201600
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/set-calendar.xml b/reference/intl/dateformatter/set-calendar.xml
index d4affe3ce2..746d051cb8 100644
--- a/reference/intl/dateformatter/set-calendar.xml
+++ b/reference/intl/dateformatter/set-calendar.xml
@@ -11,17 +11,17 @@
   <para>
    &style.oop;
   </para>
-   <methodsynopsis>
+   <methodsynopsis role="oop">
    <modifier>public</modifier> <type>bool</type><methodname>IntlDateFormatter::setCalendar</methodname>
-   <methodparam><type>mixed</type><parameter>which</parameter></methodparam>
-   </methodsynopsis>
+   <methodparam><type class="union"><type>IntlCalendar</type><type>int</type><type>null</type></type><parameter>calendar</parameter></methodparam>
+  </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
+  <methodsynopsis role="procedural">
    <type>bool</type><methodname>datefmt_set_calendar</methodname>
-  <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
-  <methodparam><type>mixed</type><parameter>which</parameter></methodparam>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
+   <methodparam><type class="union"><type>IntlCalendar</type><type>int</type><type>null</type></type><parameter>calendar</parameter></methodparam>
   </methodsynopsis>
   <para>
    Sets the calendar or calendar type used by the formatter.
@@ -33,7 +33,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        The formatter resource.
@@ -41,7 +41,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>which</parameter></term>
+     <term><parameter>calendar</parameter></term>
      <listitem>
       <para>
        This can either be: the <link
@@ -187,7 +187,6 @@ after:  Saturday, Rabiʻ II 20, 1434 at 7:00:00 PM Eastern Standard Time
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/set-lenient.xml b/reference/intl/dateformatter/set-lenient.xml
index e8c4fac844..77d1cbabdd 100644
--- a/reference/intl/dateformatter/set-lenient.xml
+++ b/reference/intl/dateformatter/set-lenient.xml
@@ -11,17 +11,17 @@
   <para>
    &style.oop;
   </para>
-   <methodsynopsis>
-    <modifier>public</modifier> <type>bool</type><methodname>IntlDateFormatter::setLenient</methodname>
-    <methodparam><type>bool</type><parameter>lenient</parameter></methodparam>
-   </methodsynopsis>
+   <methodsynopsis role="oop">
+   <modifier>public</modifier> <type>void</type><methodname>IntlDateFormatter::setLenient</methodname>
+   <methodparam><type>bool</type><parameter>lenient</parameter></methodparam>
+  </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>bool</type><methodname>datefmt_set_lenient</methodname>
-  <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
-  <methodparam><type>bool</type><parameter>lenient</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type>void</type><methodname>datefmt_set_lenient</methodname>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
+   <methodparam><type>bool</type><parameter>lenient</parameter></methodparam>
   </methodsynopsis>
   <para>
   Define if the parser is strict or lenient in interpreting inputs that do not match the pattern exactly.
@@ -36,7 +36,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
        The formatter resource      
@@ -178,7 +178,6 @@ Error_code is : 9
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/set-pattern.xml b/reference/intl/dateformatter/set-pattern.xml
index 4527b6adc0..32568c6138 100644
--- a/reference/intl/dateformatter/set-pattern.xml
+++ b/reference/intl/dateformatter/set-pattern.xml
@@ -11,17 +11,17 @@
   <para>
    &style.oop;
   </para>
-   <methodsynopsis>
-    <modifier>public</modifier> <type>bool</type><methodname>IntlDateFormatter::setPattern</methodname>
-    <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
-   </methodsynopsis>
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type>bool</type><methodname>IntlDateFormatter::setPattern</methodname>
+   <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
+  </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
+  <methodsynopsis role="procedural">
    <type>bool</type><methodname>datefmt_set_pattern</methodname>
-  <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
-  <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
+   <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
   </methodsynopsis>
   <para>
    Set the pattern used for the IntlDateFormatter.
@@ -33,7 +33,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>fmt</parameter></term>
+     <term><parameter>formatter</parameter></term>
      <listitem>
       <para>
      The formatter resource.
@@ -130,7 +130,6 @@ Second Formatted output with pattern is 19690031 04:00:00 PST
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/intl/dateformatter/settimezone.xml b/reference/intl/dateformatter/settimezone.xml
index 83adaadc91..7fc0f8f76c 100644
--- a/reference/intl/dateformatter/settimezone.xml
+++ b/reference/intl/dateformatter/settimezone.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="intldateformatter.settimezone" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>IntlDateFormatter::setTimeZone</refname>
@@ -13,20 +12,17 @@
   <para>
    &style.oop;
   </para>
-  <methodsynopsis>
-   <modifier>public</modifier> 
-   <type>bool</type>
-   <methodname>IntlDateFormatter::setTimeZone</methodname>
-   <methodparam><type>mixed</type><parameter>zone</parameter></methodparam>
+  <methodsynopsis role="oop">
+   <modifier>public</modifier> <type class="union"><type>bool</type><type>null</type></type><methodname>IntlDateFormatter::setTimeZone</methodname>
+   <methodparam><type class="union"><type>IntlTimeZone</type><type>DateTimeZone</type><type>string</type><type>null</type></type><parameter>timezone</parameter></methodparam>
   </methodsynopsis>
   <para>
    &style.procedural;
   </para>
-  <methodsynopsis>
-   <type>bool</type>
-   <methodname>datefmt_set_timezone</methodname>
-   <methodparam><type>IntlDateFormatter</type><parameter>fmt</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>zone</parameter></methodparam>
+  <methodsynopsis role="procedural">
+   <type class="union"><type>bool</type><type>null</type></type><methodname>datefmt_set_timezone</methodname>
+   <methodparam><type>IntlDateFormatter</type><parameter>formatter</parameter></methodparam>
+   <methodparam><type class="union"><type>IntlTimeZone</type><type>DateTimeZone</type><type>string</type><type>null</type></type><parameter>timezone</parameter></methodparam>
   </methodsynopsis>
 
   <para>
@@ -40,7 +36,7 @@
   &reftitle.parameters;
   <variablelist>
    <varlistentry>
-    <term><parameter>fmt</parameter></term>
+    <term><parameter>formatter</parameter></term>
     <listitem>
      <para>
     The formatter resource.
@@ -48,7 +44,7 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><parameter>zone</parameter></term>
+    <term><parameter>timezone</parameter></term>
     <listitem>
      <para>
       The timezone to use for this formatter. This can be specified in the
@@ -63,7 +59,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns &true; on success and &false; on failure.
+   Returns &null; on success and &false; on failure.
   </para>
  </refsect1>
 
@@ -132,7 +128,6 @@ IntlTimeZone Object
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml