diff --git a/reference/xmlwriter/functions/xmlwriter-end-attribute.xml b/reference/xmlwriter/functions/xmlwriter-end-attribute.xml
index ba91cd98a2..c32fd3cd60 100644
--- a/reference/xmlwriter/functions/xmlwriter-end-attribute.xml
+++ b/reference/xmlwriter/functions/xmlwriter-end-attribute.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-end-attribute" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -16,7 +16,7 @@
     <void/>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_end_attribute</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -45,10 +45,10 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-start-attribute" /></member>
-    <member><xref linkend="function.xmlwriter-start-attribute-ns" /></member>
-    <member><xref linkend="function.xmlwriter-write-attribute" /></member>
-    <member><xref linkend="function.xmlwriter-write-attribute-ns" /></member>
+    <member><methodname>XMLWriter::startAttribute</methodname></member>
+    <member><methodname>XMLWriter::startAttributeNS</methodname></member>
+    <member><methodname>XMLWriter::writeAttribute</methodname></member>
+    <member><methodname># XMLWriter::writeAttributeNS</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-end-cdata.xml b/reference/xmlwriter/functions/xmlwriter-end-cdata.xml
index 1e508b4c92..2892146171 100644
--- a/reference/xmlwriter/functions/xmlwriter-end-cdata.xml
+++ b/reference/xmlwriter/functions/xmlwriter-end-cdata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-end-cdata" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -16,7 +16,7 @@
     <void/>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_end_cdata</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -45,8 +45,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-start-cdata" /></member>
-    <member><xref linkend="function.xmlwriter-write-cdata" /></member>
+    <member><methodname>XMLWriter::startCData</methodname></member>
+    <member><methodname>XMLWriter::writeCData</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-end-comment.xml b/reference/xmlwriter/functions/xmlwriter-end-comment.xml
index 6e01c7f4bf..710f87a68a 100644
--- a/reference/xmlwriter/functions/xmlwriter-end-comment.xml
+++ b/reference/xmlwriter/functions/xmlwriter-end-comment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-end-comment" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -16,7 +16,7 @@
     <void/>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_end_comment</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -45,8 +45,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-start-comment" /></member>
-    <member><xref linkend="function.xmlwriter-write-comment" /></member>
+    <member><methodname>XMLWriter::startComment</methodname></member>
+    <member><methodname>XMLWriter::writeComment</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-end-document.xml b/reference/xmlwriter/functions/xmlwriter-end-document.xml
index fff45111ef..8539b8f11c 100644
--- a/reference/xmlwriter/functions/xmlwriter-end-document.xml
+++ b/reference/xmlwriter/functions/xmlwriter-end-document.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-end-document" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -16,7 +16,7 @@
     <void/>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_end_document</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -45,7 +45,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-start-document" /></member>
+    <member><methodname>XMLWriter::startDocument</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-end-dtd-attlist.xml b/reference/xmlwriter/functions/xmlwriter-end-dtd-attlist.xml
index ec37af9326..e9b826a733 100644
--- a/reference/xmlwriter/functions/xmlwriter-end-dtd-attlist.xml
+++ b/reference/xmlwriter/functions/xmlwriter-end-dtd-attlist.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-end-dtd-attlist" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -16,7 +16,7 @@
     <void/>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_end_dtd_attlist</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -45,8 +45,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-start-dtd-attlist" /></member>
-    <member><xref linkend="function.xmlwriter-write-dtd-attlist" /></member>
+    <member><methodname>XMLWriter::startDTDAttlist</methodname></member>
+    <member><methodname>XMLWriter::writeDTDAttlist</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-end-dtd-element.xml b/reference/xmlwriter/functions/xmlwriter-end-dtd-element.xml
index 9ccb3826e4..365c05d677 100644
--- a/reference/xmlwriter/functions/xmlwriter-end-dtd-element.xml
+++ b/reference/xmlwriter/functions/xmlwriter-end-dtd-element.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-end-dtd-element" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -16,7 +16,7 @@
     <void/>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_end_dtd_element</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -45,8 +45,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-start-dtd-element" /></member>
-    <member><xref linkend="function.xmlwriter-write-dtd-element" /></member>
+    <member><methodname>XMLWriter::startDTDElement</methodname></member>
+    <member><methodname>XMLWriter::writeDTDElement</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-end-dtd-entity.xml b/reference/xmlwriter/functions/xmlwriter-end-dtd-entity.xml
index bc9bf9e115..c80de0df2e 100644
--- a/reference/xmlwriter/functions/xmlwriter-end-dtd-entity.xml
+++ b/reference/xmlwriter/functions/xmlwriter-end-dtd-entity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-end-dtd-entity" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -16,7 +16,7 @@
     <void/>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_end_dtd_entity</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -44,8 +44,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-start-dtd-entity" /></member>
-    <member><xref linkend="function.xmlwriter-write-dtd-entity" /></member>
+    <member><methodname>XMLWriter::startDTDEntity</methodname></member>
+    <member><methodname>XMLWriter::writeDTDEntity</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-end-dtd.xml b/reference/xmlwriter/functions/xmlwriter-end-dtd.xml
index c002bc4aad..172c537f89 100644
--- a/reference/xmlwriter/functions/xmlwriter-end-dtd.xml
+++ b/reference/xmlwriter/functions/xmlwriter-end-dtd.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-end-dtd" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -16,7 +16,7 @@
     <void/>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_end_dtd</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -45,8 +45,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-start-dtd" /></member>
-    <member><xref linkend="function.xmlwriter-write-dtd" /></member>
+    <member><methodname>XMLWriter::startDTD</methodname></member>
+    <member><methodname>XMLWriter::writeDTD</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-end-element.xml b/reference/xmlwriter/functions/xmlwriter-end-element.xml
index cd1507c0aa..75b914f9c8 100644
--- a/reference/xmlwriter/functions/xmlwriter-end-element.xml
+++ b/reference/xmlwriter/functions/xmlwriter-end-element.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-end-element" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -16,7 +16,7 @@
     <void/>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_end_element</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -45,8 +45,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-start-element" /></member>
-    <member><xref linkend="function.xmlwriter-write-element" /></member>
+    <member><methodname>XMLWriter::startElement</methodname></member>
+    <member><methodname>XMLWriter::writeElement</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-end-pi.xml b/reference/xmlwriter/functions/xmlwriter-end-pi.xml
index 28081a5a81..ce1a963c13 100644
--- a/reference/xmlwriter/functions/xmlwriter-end-pi.xml
+++ b/reference/xmlwriter/functions/xmlwriter-end-pi.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-end-pi" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -16,7 +16,7 @@
     <void/>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_end_pi</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -45,8 +45,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-start-pi" /></member>
-    <member><xref linkend="function.xmlwriter-write-pi" /></member>
+    <member><methodname>XMLWriter::startPI</methodname></member>
+    <member><methodname>XMLWriter::writePI</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-flush.xml b/reference/xmlwriter/functions/xmlwriter-flush.xml
index 0a1f2ac4f3..15416ef889 100644
--- a/reference/xmlwriter/functions/xmlwriter-flush.xml
+++ b/reference/xmlwriter/functions/xmlwriter-flush.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-flush" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -16,7 +16,7 @@
     <methodparam choice="opt"><type>bool</type><parameter>empty</parameter></methodparam>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>mixed</type><methodname>xmlwriter_flush</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
diff --git a/reference/xmlwriter/functions/xmlwriter-full-end-element.xml b/reference/xmlwriter/functions/xmlwriter-full-end-element.xml
index 75ea233bd4..29b39c9a21 100644
--- a/reference/xmlwriter/functions/xmlwriter-full-end-element.xml
+++ b/reference/xmlwriter/functions/xmlwriter-full-end-element.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-full-end-element" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -16,7 +16,7 @@
     <void/>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_full_end_element</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -45,7 +45,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-end-element" /></member>
+    <member><methodname>XMLWriter::endElement</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-open-memory.xml b/reference/xmlwriter/functions/xmlwriter-open-memory.xml
index 7f8b6899cf..9557981221 100644
--- a/reference/xmlwriter/functions/xmlwriter-open-memory.xml
+++ b/reference/xmlwriter/functions/xmlwriter-open-memory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-open-memory" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -46,7 +46,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-open-uri" /></member>
+    <member><methodname>XMLWriter::openURI</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-open-uri.xml b/reference/xmlwriter/functions/xmlwriter-open-uri.xml
index a4ac15cad2..210c291ce2 100644
--- a/reference/xmlwriter/functions/xmlwriter-open-uri.xml
+++ b/reference/xmlwriter/functions/xmlwriter-open-uri.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-open-uri" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -57,7 +57,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-open-memory" /></member>
+    <member><methodname>XMLWriter::openMemory</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-output-memory.xml b/reference/xmlwriter/functions/xmlwriter-output-memory.xml
index c708bd92da..bf7327e476 100644
--- a/reference/xmlwriter/functions/xmlwriter-output-memory.xml
+++ b/reference/xmlwriter/functions/xmlwriter-output-memory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-output-memory" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -16,7 +16,7 @@
     <methodparam choice="opt"><type>bool</type><parameter>flush</parameter></methodparam>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>string</type><methodname>xmlwriter_output_memory</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -54,7 +54,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-flush" /></member>
+    <member><methodname>XMLWriter::flush</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-set-indent-string.xml b/reference/xmlwriter/functions/xmlwriter-set-indent-string.xml
index f6f6cf95a4..1b295f63b0 100644
--- a/reference/xmlwriter/functions/xmlwriter-set-indent-string.xml
+++ b/reference/xmlwriter/functions/xmlwriter-set-indent-string.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-set-indent-string" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -16,7 +16,7 @@
     <methodparam><type>string</type><parameter>indentString</parameter></methodparam>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_set_indent_string</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -55,7 +55,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-set-indent" /></member>
+    <member><methodname>XMLWriter::setIndent</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-set-indent.xml b/reference/xmlwriter/functions/xmlwriter-set-indent.xml
index 29354f7591..b2c89f8cf5 100644
--- a/reference/xmlwriter/functions/xmlwriter-set-indent.xml
+++ b/reference/xmlwriter/functions/xmlwriter-set-indent.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-set-indent" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -16,7 +16,7 @@
     <methodparam><type>bool</type><parameter>indent</parameter></methodparam>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_set_indent</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -54,7 +54,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-set-indent-string" /></member>
+    <member><methodname>XMLWriter::setIndentString</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-start-attribute-ns.xml b/reference/xmlwriter/functions/xmlwriter-start-attribute-ns.xml
index 4dac56e46f..b7456a62f2 100644
--- a/reference/xmlwriter/functions/xmlwriter-start-attribute-ns.xml
+++ b/reference/xmlwriter/functions/xmlwriter-start-attribute-ns.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-start-attribute-ns" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -18,7 +18,7 @@
     <methodparam><type>string</type><parameter>uri</parameter></methodparam>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_start_attribute_ns</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -74,10 +74,10 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-start-attribute" /></member>
-    <member><xref linkend="function.xmlwriter-end-attribute" /></member>
-    <member><xref linkend="function.xmlwriter-write-attribute" /></member>
-    <member><xref linkend="function.xmlwriter-write-attribute-ns" /></member>
+    <member><methodname>XMLWriter::startAttribute</methodname></member>
+    <member><methodname>XMLWriter::endAttribute</methodname></member>
+    <member><methodname>XMLWriter::writeAttribute</methodname></member>
+    <member><methodname>XMLWriter::writeAttributeNS</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-start-attribute.xml b/reference/xmlwriter/functions/xmlwriter-start-attribute.xml
index d78b1cc17a..bb81394542 100644
--- a/reference/xmlwriter/functions/xmlwriter-start-attribute.xml
+++ b/reference/xmlwriter/functions/xmlwriter-start-attribute.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-start-attribute" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -16,7 +16,7 @@
     <methodparam><type>string</type><parameter>name</parameter></methodparam>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_start_attribute</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -54,10 +54,10 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-start-attribute-ns" /></member>
-    <member><xref linkend="function.xmlwriter-end-attribute" /></member>
-    <member><xref linkend="function.xmlwriter-write-attribute" /></member>
-    <member><xref linkend="function.xmlwriter-write-attribute-ns" /></member>
+    <member><methodname>XMLWriter::startAttributeNS</methodname></member>
+    <member><methodname>XMLWriter::endAttribute</methodname></member>
+    <member><methodname>XMLWriter::writeAttribute</methodname></member>
+    <member><methodname>XMLWriter::writeAttributeNS</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-start-cdata.xml b/reference/xmlwriter/functions/xmlwriter-start-cdata.xml
index 94a46fe279..fd05d18398 100644
--- a/reference/xmlwriter/functions/xmlwriter-start-cdata.xml
+++ b/reference/xmlwriter/functions/xmlwriter-start-cdata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-start-cdata" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -16,7 +16,7 @@
     <void/>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_start_cdata</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -45,8 +45,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-end-cdata" /></member>
-    <member><xref linkend="function.xmlwriter-write-cdata" /></member>
+    <member><methodname>XMLWriter::endCData</methodname></member>
+    <member><methodname>XMLWriter::writeCData</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-start-comment.xml b/reference/xmlwriter/functions/xmlwriter-start-comment.xml
index 107d245e49..b5b64dad8d 100644
--- a/reference/xmlwriter/functions/xmlwriter-start-comment.xml
+++ b/reference/xmlwriter/functions/xmlwriter-start-comment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-start-comment" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -16,7 +16,7 @@
     <void/>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_start_comment</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -45,8 +45,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-end-comment" /></member>
-    <member><xref linkend="function.xmlwriter-write-comment" /></member>
+    <member><methodname>XMLWriter::endComment</methodname></member>
+    <member><methodname>XMLWriter::writeComment</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-start-document.xml b/reference/xmlwriter/functions/xmlwriter-start-document.xml
index 5211e439d5..e4be060e2f 100644
--- a/reference/xmlwriter/functions/xmlwriter-start-document.xml
+++ b/reference/xmlwriter/functions/xmlwriter-start-document.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-start-document" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -18,7 +18,7 @@
     <methodparam choice="opt"><type>string</type><parameter>standalone</parameter></methodparam>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_start_document</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -77,7 +77,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-end-document" /></member>
+    <member><methodname>XMLWriter::endDocument</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-start-dtd-attlist.xml b/reference/xmlwriter/functions/xmlwriter-start-dtd-attlist.xml
index 07cc2dd85d..4cc9db405c 100644
--- a/reference/xmlwriter/functions/xmlwriter-start-dtd-attlist.xml
+++ b/reference/xmlwriter/functions/xmlwriter-start-dtd-attlist.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-start-dtd-attlist" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -16,7 +16,7 @@
     <methodparam><type>string</type><parameter>name</parameter></methodparam>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_start_dtd_attlist</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -54,8 +54,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-end-dtd-attlist" /></member>
-    <member><xref linkend="function.xmlwriter-write-dtd-attlist" /></member>
+    <member><methodname>XMLWriter::endDTDAttlist</methodname></member>
+    <member><methodname>XMLWriter::writeDTDAttlist</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-start-dtd-element.xml b/reference/xmlwriter/functions/xmlwriter-start-dtd-element.xml
index d89a96a4a1..7af49e1259 100644
--- a/reference/xmlwriter/functions/xmlwriter-start-dtd-element.xml
+++ b/reference/xmlwriter/functions/xmlwriter-start-dtd-element.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-start-dtd-element" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -16,7 +16,7 @@
     <methodparam><type>string</type><parameter>qualifiedName</parameter></methodparam>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_start_dtd_element</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -54,8 +54,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-end-dtd-element" /></member>
-    <member><xref linkend="function.xmlwriter-write-dtd-element" /></member>
+    <member><methodname>XMLWriter::endDTDElement</methodname></member>
+    <member><methodname>XMLWriter::writeDTDElement</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-start-dtd-entity.xml b/reference/xmlwriter/functions/xmlwriter-start-dtd-entity.xml
index b1abe0146a..5e44448cba 100644
--- a/reference/xmlwriter/functions/xmlwriter-start-dtd-entity.xml
+++ b/reference/xmlwriter/functions/xmlwriter-start-dtd-entity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-start-dtd-entity" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -17,7 +17,7 @@
     <methodparam><type>bool</type><parameter>isparam</parameter></methodparam>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_start_dtd_entity</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -63,8 +63,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-end-dtd-entity" /></member>
-    <member><xref linkend="function.xmlwriter-write-dtd-entity" /></member>
+    <member><methodname>XMLWriter::endDTDEntity</methodname></member>
+    <member><methodname>XMLWriter::writeDTDEntity</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-start-dtd.xml b/reference/xmlwriter/functions/xmlwriter-start-dtd.xml
index 42b411da1a..ead3b3bf9a 100644
--- a/reference/xmlwriter/functions/xmlwriter-start-dtd.xml
+++ b/reference/xmlwriter/functions/xmlwriter-start-dtd.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-start-dtd" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -18,7 +18,7 @@
     <methodparam choice="opt"><type>string</type><parameter>systemId</parameter></methodparam>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_start_dtd</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -74,8 +74,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-end-dtd" /></member>
-    <member><xref linkend="function.xmlwriter-write-dtd" /></member>
+    <member><methodname>XMLWriter::endDTD</methodname></member>
+    <member><methodname>XMLWriter::writeDTD</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-start-element-ns.xml b/reference/xmlwriter/functions/xmlwriter-start-element-ns.xml
index 94dfb34440..766516f8b1 100644
--- a/reference/xmlwriter/functions/xmlwriter-start-element-ns.xml
+++ b/reference/xmlwriter/functions/xmlwriter-start-element-ns.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-start-element-ns" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -18,7 +18,7 @@
     <methodparam><type>string</type><parameter>uri</parameter></methodparam>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_start_element_ns</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -74,8 +74,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-end-element" /></member>
-    <member><xref linkend="function.xmlwriter-write-element-ns" /></member>
+    <member><methodname>XMLWriter::endElement</methodname></member>
+    <member><methodname>XMLWriter::writeElementNS</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-start-element.xml b/reference/xmlwriter/functions/xmlwriter-start-element.xml
index 289ffea968..d2e0362497 100644
--- a/reference/xmlwriter/functions/xmlwriter-start-element.xml
+++ b/reference/xmlwriter/functions/xmlwriter-start-element.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-start-element" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -16,7 +16,7 @@
     <methodparam><type>string</type><parameter>name</parameter></methodparam>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_start_element</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -54,8 +54,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-end-element" /></member>
-    <member><xref linkend="function.xmlwriter-write-element" /></member>
+    <member><methodname>XMLWriter::endElement</methodname></member>
+    <member><methodname>XMLWriter::writeElement</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-start-pi.xml b/reference/xmlwriter/functions/xmlwriter-start-pi.xml
index 96f04146ed..e06d9c9b5b 100644
--- a/reference/xmlwriter/functions/xmlwriter-start-pi.xml
+++ b/reference/xmlwriter/functions/xmlwriter-start-pi.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-start-pi" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -16,7 +16,7 @@
     <methodparam><type>string</type><parameter>target</parameter></methodparam>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_start_pi</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -54,8 +54,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-end-pi" /></member>
-    <member><xref linkend="function.xmlwriter-write-pi" /></member>
+    <member><methodname>XMLWriter::endPI</methodname></member>
+    <member><methodname>XMLWriter::writePI</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-text.xml b/reference/xmlwriter/functions/xmlwriter-text.xml
index c0e38b5992..fdcbefc575 100644
--- a/reference/xmlwriter/functions/xmlwriter-text.xml
+++ b/reference/xmlwriter/functions/xmlwriter-text.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-text" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -16,7 +16,7 @@
     <methodparam><type>string</type><parameter>content</parameter></methodparam>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_text</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
diff --git a/reference/xmlwriter/functions/xmlwriter-write-attribute-ns.xml b/reference/xmlwriter/functions/xmlwriter-write-attribute-ns.xml
index db6610b187..2d253165d4 100644
--- a/reference/xmlwriter/functions/xmlwriter-write-attribute-ns.xml
+++ b/reference/xmlwriter/functions/xmlwriter-write-attribute-ns.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-write-attribute-ns" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -19,7 +19,7 @@
     <methodparam><type>string</type><parameter>content</parameter></methodparam>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_write_attribute_ns</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -84,10 +84,10 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-write-attribute" /></member>
-    <member><xref linkend="function.xmlwriter-start-attribute" /></member>
-    <member><xref linkend="function.xmlwriter-start-attribute-ns" /></member>
-    <member><xref linkend="function.xmlwriter-end-attribute" /></member>
+    <member><methodname>XMLWriter::writeAttribute</methodname></member>
+    <member><methodname>XMLWriter::startAttribute</methodname></member>
+    <member><methodname>XMLWriter::startAttributeNS</methodname></member>
+    <member><methodname>XMLWriter::endAttribute</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-write-attribute.xml b/reference/xmlwriter/functions/xmlwriter-write-attribute.xml
index f91ef49d46..e1c9d6daef 100644
--- a/reference/xmlwriter/functions/xmlwriter-write-attribute.xml
+++ b/reference/xmlwriter/functions/xmlwriter-write-attribute.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-write-attribute" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -17,7 +17,7 @@
     <methodparam><type>string</type><parameter>value</parameter></methodparam>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_write_attribute</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -64,10 +64,10 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-write-attribute-ns" /></member>
-    <member><xref linkend="function.xmlwriter-start-attribute" /></member>
-    <member><xref linkend="function.xmlwriter-start-attribute-ns" /></member>
-    <member><xref linkend="function.xmlwriter-end-attribute" /></member>
+    <member><methodname>XMLWriter::writeAttributeNS</methodname></member>
+    <member><methodname>XMLWriter::startAttribute</methodname></member>
+    <member><methodname>XMLWriter::startAttributeNS</methodname></member>
+    <member><methodname>XMLWriter::endAttribute</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-write-cdata.xml b/reference/xmlwriter/functions/xmlwriter-write-cdata.xml
index 6d07b250b6..f5a9f51a18 100644
--- a/reference/xmlwriter/functions/xmlwriter-write-cdata.xml
+++ b/reference/xmlwriter/functions/xmlwriter-write-cdata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-write-cdata" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -16,7 +16,7 @@
     <methodparam><type>string</type><parameter>content</parameter></methodparam>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_write_cdata</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -54,8 +54,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-start-cdata" /></member>
-    <member><xref linkend="function.xmlwriter-end-cdata" /></member>
+    <member><methodname>XMLWriter::startCData</methodname></member>
+    <member><methodname>XMLWriter::endCData</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-write-comment.xml b/reference/xmlwriter/functions/xmlwriter-write-comment.xml
index f3c966c9b9..052e912302 100644
--- a/reference/xmlwriter/functions/xmlwriter-write-comment.xml
+++ b/reference/xmlwriter/functions/xmlwriter-write-comment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-write-comment" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -16,7 +16,7 @@
     <methodparam><type>string</type><parameter>content</parameter></methodparam>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_write_comment</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -54,8 +54,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-start-comment" /></member>
-    <member><xref linkend="function.xmlwriter-end-comment" /></member>
+    <member><methodname>XMLWriter::startComment</methodname></member>
+    <member><methodname>XMLWriter::endComment</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-write-dtd-attlist.xml b/reference/xmlwriter/functions/xmlwriter-write-dtd-attlist.xml
index edfbbb8b2c..ea67785988 100644
--- a/reference/xmlwriter/functions/xmlwriter-write-dtd-attlist.xml
+++ b/reference/xmlwriter/functions/xmlwriter-write-dtd-attlist.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-write-dtd-attlist" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -17,7 +17,7 @@
     <methodparam><type>string</type><parameter>content</parameter></methodparam>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_write_dtd_attlist</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -64,8 +64,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-start-dtd-attlist" /></member>
-    <member><xref linkend="function.xmlwriter-end-dtd-attlist" /></member>
+    <member><methodname>XMLWriter::startDTDAttlist</methodname></member>
+    <member><methodname>XMLWriter::endDTDAttlist</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-write-dtd-element.xml b/reference/xmlwriter/functions/xmlwriter-write-dtd-element.xml
index 4972bdf302..1dc425f327 100644
--- a/reference/xmlwriter/functions/xmlwriter-write-dtd-element.xml
+++ b/reference/xmlwriter/functions/xmlwriter-write-dtd-element.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-write-dtd-element" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -17,7 +17,7 @@
     <methodparam><type>string</type><parameter>content</parameter></methodparam>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_write_dtd_element</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -64,8 +64,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-start-dtd-element" /></member>
-    <member><xref linkend="function.xmlwriter-end-dtd-element" /></member>
+    <member><methodname>XMLWriter::startDTDElement</methodname></member>
+    <member><methodname>XMLWriter::endDTDElement</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-write-dtd-entity.xml b/reference/xmlwriter/functions/xmlwriter-write-dtd-entity.xml
index fed56c2746..937e5cc9de 100644
--- a/reference/xmlwriter/functions/xmlwriter-write-dtd-entity.xml
+++ b/reference/xmlwriter/functions/xmlwriter-write-dtd-entity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-write-dtd-entity" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -21,7 +21,7 @@
     <methodparam><type>string</type><parameter>ndataid</parameter></methodparam>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_write_dtd_entity</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -72,8 +72,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-start-dtd-entity" /></member>
-    <member><xref linkend="function.xmlwriter-end-dtd-entity" /></member>
+    <member><methodname>XMLWriter::startDTDEntity</methodname></member>
+    <member><methodname>XMLWriter::endDTDEntity</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-write-dtd.xml b/reference/xmlwriter/functions/xmlwriter-write-dtd.xml
index d1d7f998bb..b2ff14bbb4 100644
--- a/reference/xmlwriter/functions/xmlwriter-write-dtd.xml
+++ b/reference/xmlwriter/functions/xmlwriter-write-dtd.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-write-dtd" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -19,7 +19,7 @@
     <methodparam choice="opt"><type>string</type><parameter>subset</parameter></methodparam>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_write_dtd</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -84,8 +84,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-start-dtd" /></member>
-    <member><xref linkend="function.xmlwriter-end-dtd" /></member>
+    <member><methodname>XMLWriter::startDTD</methodname></member>
+    <member><methodname>XMLWriter::endDTD</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-write-element-ns.xml b/reference/xmlwriter/functions/xmlwriter-write-element-ns.xml
index 075b768b2b..733d012f90 100644
--- a/reference/xmlwriter/functions/xmlwriter-write-element-ns.xml
+++ b/reference/xmlwriter/functions/xmlwriter-write-element-ns.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-write-element-ns" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -19,7 +19,7 @@
     <methodparam choice="opt"><type>string</type><parameter>content</parameter></methodparam>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_write_element_ns</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -108,9 +108,9 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-start-element-ns" /></member>
-    <member><xref linkend="function.xmlwriter-end-element" /></member>
-    <member><xref linkend="function.xmlwriter-write-element" /></member>
+    <member><methodname>XMLWriter::startElementNS</methodname></member>
+    <member><methodname>XMLWriter::endElement</methodname></member>
+    <member><methodname>XMLWriter::writeElement</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-write-element.xml b/reference/xmlwriter/functions/xmlwriter-write-element.xml
index 9ac82fd2d6..e5e3457052 100644
--- a/reference/xmlwriter/functions/xmlwriter-write-element.xml
+++ b/reference/xmlwriter/functions/xmlwriter-write-element.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-write-element" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -17,7 +17,7 @@
     <methodparam choice="opt"><type>string</type><parameter>content</parameter></methodparam>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_write_element</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -88,9 +88,9 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-start-element" /></member>
-    <member><xref linkend="function.xmlwriter-end-element" /></member>
-    <member><xref linkend="function.xmlwriter-write-element-ns" /></member>
+    <member><methodname>XMLWriter::startElement</methodname></member>
+    <member><methodname>XMLWriter::endElement</methodname></member>
+    <member><methodname>XMLWriter::writeElementNS</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-write-pi.xml b/reference/xmlwriter/functions/xmlwriter-write-pi.xml
index 35fbb8fa71..460b812c84 100644
--- a/reference/xmlwriter/functions/xmlwriter-write-pi.xml
+++ b/reference/xmlwriter/functions/xmlwriter-write-pi.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-write-pi" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -17,7 +17,7 @@
     <methodparam><type>string</type><parameter>content</parameter></methodparam>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_write_pi</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -64,8 +64,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-start-pi" /></member>
-    <member><xref linkend="function.xmlwriter-end-pi" /></member>
+    <member><methodname>XMLWriter::startPI</methodname></member>
+    <member><methodname>XMLWriter::endPI</methodname></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/xmlwriter/functions/xmlwriter-write-raw.xml b/reference/xmlwriter/functions/xmlwriter-write-raw.xml
index 67f9bddb5b..b9a9dd8ad3 100644
--- a/reference/xmlwriter/functions/xmlwriter-write-raw.xml
+++ b/reference/xmlwriter/functions/xmlwriter-write-raw.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
 <refentry xml:id="function.xmlwriter-write-raw" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -8,7 +8,7 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <para>Object oriented style:</para>
+  <para>&style.oop;</para>
   <classsynopsis>
    <ooclass><classname>XMLWriter</classname></ooclass>
    <methodsynopsis>
@@ -16,7 +16,7 @@
     <methodparam><type>string</type><parameter>content</parameter></methodparam>
    </methodsynopsis>
   </classsynopsis>
-  <para>Procedural style:</para>
+  <para>&style.procedural;</para>
   <methodsynopsis>
    <type>bool</type><methodname>xmlwriter_write_raw</methodname>
    <methodparam><type>resource</type><parameter>xmlwriter</parameter></methodparam>
@@ -54,7 +54,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="function.xmlwriter-text" /></member>
+    <member><methodname>XMLWriter::text</methodname></member>
    </simplelist>
   </para>
  </refsect1>