From a7b1558cb2a0dcba144b7228397daaad90e67b2b Mon Sep 17 00:00:00 2001
From: Hannes Magnusson <bjori@php.net>
Date: Sun, 23 Dec 2007 22:19:36 +0000
Subject: [PATCH] Upgrade the synopsis and ID to the new-oo-style

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@248887 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/xmlreader/xmlreader/close.xml       | 15 ++++++-------
 reference/xmlreader/xmlreader/expand.xml      | 17 +++++++--------
 .../xmlreader/xmlreader/getattribute.xml      | 17 +++++++--------
 .../xmlreader/xmlreader/getattributeno.xml    | 17 +++++++--------
 .../xmlreader/xmlreader/getattributens.xml    | 17 +++++++--------
 .../xmlreader/xmlreader/getparserproperty.xml | 15 ++++++-------
 reference/xmlreader/xmlreader/isvalid.xml     | 15 ++++++-------
 .../xmlreader/xmlreader/lookupnamespace.xml   | 17 +++++++--------
 .../xmlreader/xmlreader/movetoattribute.xml   | 17 +++++++--------
 .../xmlreader/xmlreader/movetoattributeNo.xml | 17 +++++++--------
 .../xmlreader/xmlreader/movetoattributeNs.xml | 19 +++++++----------
 .../xmlreader/xmlreader/movetoelement.xml     | 15 ++++++-------
 .../xmlreader/movetofirstattribute.xml        | 15 ++++++-------
 .../xmlreader/movetonextattribute.xml         | 15 ++++++-------
 reference/xmlreader/xmlreader/next.xml        | 17 +++++++--------
 reference/xmlreader/xmlreader/open.xml        | 21 ++++++++-----------
 reference/xmlreader/xmlreader/read.xml        | 15 ++++++-------
 .../xmlreader/xmlreader/setparserproperty.xml | 19 +++++++----------
 .../xmlreader/xmlreader/setrelaxngschema.xml  | 17 +++++++--------
 .../xmlreader/setrelaxngschemasource.xml      | 17 +++++++--------
 reference/xmlreader/xmlreader/xml.xml         | 21 ++++++++-----------
 21 files changed, 146 insertions(+), 209 deletions(-)

diff --git a/reference/xmlreader/xmlreader/close.xml b/reference/xmlreader/xmlreader/close.xml
index 858a36a56c..b2cd7f6914 100644
--- a/reference/xmlreader/xmlreader/close.xml
+++ b/reference/xmlreader/xmlreader/close.xml
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
-<refentry xml:id="function.xmlreader-close" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.2 $ -->
+<refentry xml:id="xmlreader.close" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>XMLReader::close</refname>
   <refpurpose>Close the XMLReader input</refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <classsynopsis>
-   <ooclass><classname>XMLReader</classname></ooclass>
-   <methodsynopsis>
-    <type>bool</type><methodname>close</methodname>
-    <void/>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>bool</type><methodname>XMLReader::close</methodname>
+   <void/>
+  </methodsynopsis>
   <para>
    Closes the input the XMLReader object is currently parsing.
   </para>
diff --git a/reference/xmlreader/xmlreader/expand.xml b/reference/xmlreader/xmlreader/expand.xml
index 26d74c89b6..414749f150 100644
--- a/reference/xmlreader/xmlreader/expand.xml
+++ b/reference/xmlreader/xmlreader/expand.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
-<refentry xml:id="function.xmlreader-expand" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.2 $ -->
+<refentry xml:id="xmlreader.expand" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>XMLReader::expand</refname>
   <refpurpose>Returns a copy of the current node as a DOM object</refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <classsynopsis>
-   <ooclass><classname>XMLReader</classname></ooclass>
-   <methodsynopsis>
-    <type>DOMNode</type>
-    <methodname>expand</methodname>
-    <void/>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>DOMNode</type>
+   <methodname>XMLReader::expand</methodname>
+   <void/>
+  </methodsynopsis>
   <para>
    This method copies the current node and returns the appropriate DOM object.
   </para>
diff --git a/reference/xmlreader/xmlreader/getattribute.xml b/reference/xmlreader/xmlreader/getattribute.xml
index 9fa4c0f217..e84496088f 100644
--- a/reference/xmlreader/xmlreader/getattribute.xml
+++ b/reference/xmlreader/xmlreader/getattribute.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
-<refentry xml:id="function.xmlreader-getattribute" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.2 $ -->
+<refentry xml:id="xmlreader.getattribute" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>XMLReader::getAttribute</refname>
   <refpurpose>Get the value of a named attribute</refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <classsynopsis>
-   <ooclass><classname>XMLReader</classname></ooclass>
-   <methodsynopsis>
-    <type>string</type>
-    <methodname>getAttribute</methodname>
-    <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>string</type>
+   <methodname>XMLReader::getAttribute</methodname>
+   <methodparam><type>string</type><parameter>name</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Returns the value of a named attribute or an empty string if 
    attribute does not exist or not positioned on an element node.
diff --git a/reference/xmlreader/xmlreader/getattributeno.xml b/reference/xmlreader/xmlreader/getattributeno.xml
index d29260d129..2d3f2185ac 100644
--- a/reference/xmlreader/xmlreader/getattributeno.xml
+++ b/reference/xmlreader/xmlreader/getattributeno.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
-<refentry xml:id="function.xmlreader-getattributeno" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.2 $ -->
+<refentry xml:id="xmlreader.getattributeno" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>XMLReader::getAttributeNo</refname>
   <refpurpose>Get the value of an attribute by index</refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <classsynopsis>
-   <ooclass><classname>XMLReader</classname></ooclass>
-   <methodsynopsis>
-    <type>string</type>
-    <methodname>getAttributeNo</methodname>
-    <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>string</type>
+   <methodname>XMLReader::getAttributeNo</methodname>
+   <methodparam><type>int</type><parameter>index</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Returns the value of an attribute based on its position or an 
    empty string if attribute does not exist or not positioned on 
diff --git a/reference/xmlreader/xmlreader/getattributens.xml b/reference/xmlreader/xmlreader/getattributens.xml
index 4a04b9822f..d555b1a56b 100644
--- a/reference/xmlreader/xmlreader/getattributens.xml
+++ b/reference/xmlreader/xmlreader/getattributens.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
-<refentry xml:id="function.xmlreader-getattributens" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.2 $ -->
+<refentry xml:id="xmlreader.getattributens" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>XMLReader::getAttributeNs</refname>
   <refpurpose>Get the value of an attribute by localname and URI</refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <classsynopsis>
-   <ooclass><classname>XMLReader</classname></ooclass>
-   <methodsynopsis>
-    <type>string</type><methodname>getAttributeNs</methodname>
-    <methodparam><type>string</type><parameter>localName</parameter></methodparam>
-    <methodparam><type>string</type><parameter>namespaceURI</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>string</type><methodname>XMLReader::getAttributeNs</methodname>
+   <methodparam><type>string</type><parameter>localName</parameter></methodparam>
+   <methodparam><type>string</type><parameter>namespaceURI</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Returns the value of an attribute by name and namespace URI or an empty 
    string if attribute does not exist or not positioned on an element node.
diff --git a/reference/xmlreader/xmlreader/getparserproperty.xml b/reference/xmlreader/xmlreader/getparserproperty.xml
index 54aff44332..5654d7b8e9 100644
--- a/reference/xmlreader/xmlreader/getparserproperty.xml
+++ b/reference/xmlreader/xmlreader/getparserproperty.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
-<refentry xml:id='function.xmlreader-getparserproperty' xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.2 $ -->
+<refentry xml:id='xmlreader.getparserproperty' xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>XMLReader::getParserProperty</refname>
   <refpurpose>
@@ -9,13 +9,10 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <classsynopsis>
-   <ooclass><classname>XMLReader</classname></ooclass>
-   <methodsynopsis>
-    <type>bool</type><methodname>getParserProperty</methodname>
-    <methodparam><type>int</type><parameter>property</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>bool</type><methodname>XMLReader::getParserProperty</methodname>
+   <methodparam><type>int</type><parameter>property</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Indicates if specified property has been set.
   </para>
diff --git a/reference/xmlreader/xmlreader/isvalid.xml b/reference/xmlreader/xmlreader/isvalid.xml
index 6d194dd650..8ce3a656e7 100644
--- a/reference/xmlreader/xmlreader/isvalid.xml
+++ b/reference/xmlreader/xmlreader/isvalid.xml
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
-<refentry xml:id="function.xmlreader-isvalid" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.2 $ -->
+<refentry xml:id="xmlreader.isvalid" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>XMLReader::isValid</refname>
   <refpurpose>Indicates if the parsed document is valid</refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <classsynopsis>
-   <ooclass><classname>XMLReader</classname></ooclass>
-   <methodsynopsis>
-    <type>bool</type><methodname>isValid</methodname>
-    <void/>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>bool</type><methodname>XMLReader::isValid</methodname>
+   <void/>
+  </methodsynopsis>
   <para>
    Returns a boolean indicating if the document being parsed is currently valid.
   </para>
diff --git a/reference/xmlreader/xmlreader/lookupnamespace.xml b/reference/xmlreader/xmlreader/lookupnamespace.xml
index 1c2b699cb8..bdc55ee9aa 100644
--- a/reference/xmlreader/xmlreader/lookupnamespace.xml
+++ b/reference/xmlreader/xmlreader/lookupnamespace.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
-<refentry xml:id="function.xmlreader-lookupnamespace" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.2 $ -->
+<refentry xml:id="xmlreader.lookupnamespace" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>XMLReader::lookupNamespace</refname>
   <refpurpose>Lookup namespace for a prefix</refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <classsynopsis>
-   <ooclass><classname>XMLReader</classname></ooclass>
-   <methodsynopsis>
-    <type>bool</type>
-    <methodname>lookupNamespace</methodname>
-    <methodparam><type>string</type><parameter>prefix</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>bool</type>
+   <methodname>XMLReader::lookupNamespace</methodname>
+   <methodparam><type>string</type><parameter>prefix</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Lookup in scope namespace for a given prefix.
   </para>
diff --git a/reference/xmlreader/xmlreader/movetoattribute.xml b/reference/xmlreader/xmlreader/movetoattribute.xml
index f15f97656b..42ad020090 100644
--- a/reference/xmlreader/xmlreader/movetoattribute.xml
+++ b/reference/xmlreader/xmlreader/movetoattribute.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
-<refentry xml:id="function.xmlreader-movetoattribute" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.2 $ -->
+<refentry xml:id="xmlreader.movetoattribute" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>XMLReader::moveToAttribute</refname>
   <refpurpose>Move cursor to a named attribute</refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <classsynopsis>
-   <ooclass><classname>XMLReader</classname></ooclass>
-   <methodsynopsis>
-    <type>bool</type>
-    <methodname>moveToAttribute</methodname>
-    <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>bool</type>
+   <methodname>XMLReader::moveToAttribute</methodname>
+   <methodparam><type>string</type><parameter>name</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Positions cursor on the named attribute.
   </para>
diff --git a/reference/xmlreader/xmlreader/movetoattributeNo.xml b/reference/xmlreader/xmlreader/movetoattributeNo.xml
index bd44ae1941..f4216ddc09 100644
--- a/reference/xmlreader/xmlreader/movetoattributeNo.xml
+++ b/reference/xmlreader/xmlreader/movetoattributeNo.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
-<refentry xml:id="function.xmlreader-movetoattributeno" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.2 $ -->
+<refentry xml:id="xmlreader.movetoattributeno" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>XMLReader::moveToAttributeNo</refname>
   <refpurpose>Move cursor to an attribute by index</refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <classsynopsis>
-   <ooclass><classname>XMLReader</classname></ooclass>
-   <methodsynopsis>
-    <type>bool</type>
-    <methodname>moveToAttributeNo</methodname>
-    <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>bool</type>
+   <methodname>XMLReader::moveToAttributeNo</methodname>
+   <methodparam><type>int</type><parameter>index</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Positions cursor on attribute based on its position. 
   </para>
diff --git a/reference/xmlreader/xmlreader/movetoattributeNs.xml b/reference/xmlreader/xmlreader/movetoattributeNs.xml
index 45f896f012..7b90270591 100644
--- a/reference/xmlreader/xmlreader/movetoattributeNs.xml
+++ b/reference/xmlreader/xmlreader/movetoattributeNs.xml
@@ -1,21 +1,18 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
-<refentry xml:id="function.xmlreader-movetoattributens" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.2 $ -->
+<refentry xml:id="xmlreader.movetoattributens" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>XMLReader::moveToAttributeNs</refname>
   <refpurpose>Move cursor to a named attribute</refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <classsynopsis>
-   <ooclass><classname>XMLReader</classname></ooclass>
-   <methodsynopsis>
-    <type>bool</type>
-    <methodname>moveToAttributeNs</methodname>
-    <methodparam><type>string</type><parameter>localName</parameter></methodparam>
-    <methodparam><type>string</type><parameter>namespaceURI</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>bool</type>
+   <methodname>XMLReader::moveToAttributeNs</methodname>
+   <methodparam><type>string</type><parameter>localName</parameter></methodparam>
+   <methodparam><type>string</type><parameter>namespaceURI</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Positions cursor on the named attribute in specified namespace.
   </para>
diff --git a/reference/xmlreader/xmlreader/movetoelement.xml b/reference/xmlreader/xmlreader/movetoelement.xml
index 10dd382451..efb1f3a80f 100644
--- a/reference/xmlreader/xmlreader/movetoelement.xml
+++ b/reference/xmlreader/xmlreader/movetoelement.xml
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
-<refentry xml:id="function.xmlreader-movetoelement" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.2 $ -->
+<refentry xml:id="xmlreader.movetoelement" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>XMLReader::moveToElement</refname>
   <refpurpose>Position cursor on the parent Element of current Attribute</refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <classsynopsis>
-   <ooclass><classname>XMLReader</classname></ooclass>
-   <methodsynopsis>
-    <type>bool</type><methodname>moveToElement</methodname>
-    <void/>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>bool</type><methodname>XMLReader::moveToElement</methodname>
+   <void/>
+  </methodsynopsis>
   <para>
    Moves cursor to the parent Element of current Attribute. 
   </para>
diff --git a/reference/xmlreader/xmlreader/movetofirstattribute.xml b/reference/xmlreader/xmlreader/movetofirstattribute.xml
index 04863c376a..b09128b4f3 100644
--- a/reference/xmlreader/xmlreader/movetofirstattribute.xml
+++ b/reference/xmlreader/xmlreader/movetofirstattribute.xml
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
-<refentry xml:id="function.xmlreader-movetofirstattribute" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.2 $ -->
+<refentry xml:id="xmlreader.movetofirstattribute" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>XMLReader::moveToFirstAttribute</refname>
   <refpurpose>Position cursor on the first Attribute</refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <classsynopsis>
-   <ooclass><classname>XMLReader</classname></ooclass>
-   <methodsynopsis>
-    <type>bool</type><methodname>moveToFirstAttribute</methodname>
-    <void/>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>bool</type><methodname>XMLReader::moveToFirstAttribute</methodname>
+   <void/>
+  </methodsynopsis>
   <para>
    Moves cursor to the first Attribute.
   </para>
diff --git a/reference/xmlreader/xmlreader/movetonextattribute.xml b/reference/xmlreader/xmlreader/movetonextattribute.xml
index 7b41889a1c..da8af40141 100644
--- a/reference/xmlreader/xmlreader/movetonextattribute.xml
+++ b/reference/xmlreader/xmlreader/movetonextattribute.xml
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
-<refentry xml:id="function.xmlreader-movetonextattribute" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.2 $ -->
+<refentry xml:id="xmlreader.movetonextattribute" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>XMLReader::moveToNextAttribute</refname>
   <refpurpose>Position cursor on the next Attribute</refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <classsynopsis>
-   <ooclass><classname>XMLReader</classname></ooclass>
-   <methodsynopsis>
-    <type>bool</type><methodname>moveToNextAttribute</methodname>
-    <void/>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>bool</type><methodname>XMLReader::moveToNextAttribute</methodname>
+   <void/>
+  </methodsynopsis>
   <para>
    Moves cursor to the next Attribute if positioned on an Attribute or 
    moves to first attribute if positioned on an Element.
diff --git a/reference/xmlreader/xmlreader/next.xml b/reference/xmlreader/xmlreader/next.xml
index 4b81404e70..d0dc2b394e 100644
--- a/reference/xmlreader/xmlreader/next.xml
+++ b/reference/xmlreader/xmlreader/next.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
-<refentry xml:id="function.xmlreader-next" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.2 $ -->
+<refentry xml:id="xmlreader.next" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>XMLReader::next</refname>
   <refpurpose>Move cursor to next node skipping all subtrees</refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <classsynopsis>
-   <ooclass><classname>XMLReader</classname></ooclass>
-   <methodsynopsis>
-    <type>bool</type>
-    <methodname>next</methodname>
-    <methodparam choice='opt'><type>string</type><parameter>localname</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>bool</type>
+   <methodname>XMLReader::next</methodname>
+   <methodparam choice='opt'><type>string</type><parameter>localname</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Positions cursor on the next node skipping all subtrees.
   </para>
diff --git a/reference/xmlreader/xmlreader/open.xml b/reference/xmlreader/xmlreader/open.xml
index bc748099f2..8721edb8b1 100644
--- a/reference/xmlreader/xmlreader/open.xml
+++ b/reference/xmlreader/xmlreader/open.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
-<refentry xml:id="function.xmlreader-open" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.2 $ -->
+<refentry xml:id="xmlreader.open" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>XMLReader::open</refname>
   <refpurpose>Set the URI containing the XML to parse</refpurpose>
@@ -8,16 +8,13 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <classsynopsis>
-   <ooclass><classname>XMLReader</classname></ooclass>
-   <methodsynopsis>
-    <type>bool</type>
-    <methodname>open</methodname>
-    <methodparam><type>string</type><parameter>URI</parameter></methodparam>
-    <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
-    <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>bool</type>
+   <methodname>XMLReader::open</methodname>
+   <methodparam><type>string</type><parameter>URI</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Set the URI containing the XML document to be parsed.
   </para>
diff --git a/reference/xmlreader/xmlreader/read.xml b/reference/xmlreader/xmlreader/read.xml
index 164085e9f4..677bc2c051 100644
--- a/reference/xmlreader/xmlreader/read.xml
+++ b/reference/xmlreader/xmlreader/read.xml
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
-<refentry xml:id="function.xmlreader-read" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.2 $ -->
+<refentry xml:id="xmlreader.read" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>XMLReader::read</refname>
   <refpurpose>Move to next node in document</refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <classsynopsis>
-   <ooclass><classname>XMLReader</classname></ooclass>
-   <methodsynopsis>
-    <type>bool</type><methodname>read</methodname>
-    <void/>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>bool</type><methodname>XMLReader::read</methodname>
+   <void/>
+  </methodsynopsis>
   <para>
    Moves cursor to the next node in the document.
   </para>
diff --git a/reference/xmlreader/xmlreader/setparserproperty.xml b/reference/xmlreader/xmlreader/setparserproperty.xml
index b5413cbb37..b81aad5f5a 100644
--- a/reference/xmlreader/xmlreader/setparserproperty.xml
+++ b/reference/xmlreader/xmlreader/setparserproperty.xml
@@ -1,21 +1,18 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
-<refentry xml:id="function.xmlreader-setparserproperty" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.2 $ -->
+<refentry xml:id="xmlreader.setparserproperty" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>XMLReader::setParserProperty</refname>
   <refpurpose>Set or Unset parser options</refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <classsynopsis>
-   <ooclass><classname>XMLReader</classname></ooclass>
-   <methodsynopsis>
-    <type>bool</type>
-    <methodname>setParserProperty</methodname>
-    <methodparam><type>int</type><parameter>property</parameter></methodparam>
-    <methodparam><type>bool</type><parameter>value</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>bool</type>
+   <methodname>XMLReader::setParserProperty</methodname>
+   <methodparam><type>int</type><parameter>property</parameter></methodparam>
+   <methodparam><type>bool</type><parameter>value</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Set or Unset parser option for the parser. The options must be set 
    after <function>xmlreader-open</function> or 
diff --git a/reference/xmlreader/xmlreader/setrelaxngschema.xml b/reference/xmlreader/xmlreader/setrelaxngschema.xml
index a661daad6e..8fe7dc8ec6 100644
--- a/reference/xmlreader/xmlreader/setrelaxngschema.xml
+++ b/reference/xmlreader/xmlreader/setrelaxngschema.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
-<refentry xml:id="function.xmlreader-setrelaxngschema" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.2 $ -->
+<refentry xml:id="xmlreader.setrelaxngschema" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>XMLReader::setRelaxNGSchema</refname>
   <refpurpose>Set the filename or URI for a RelaxNG Schema</refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <classsynopsis>
-   <ooclass><classname>XMLReader</classname></ooclass>
-   <methodsynopsis>
-    <type>bool</type>
-    <methodname>setRelaxNGSchema</methodname>
-    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>bool</type>
+   <methodname>XMLReader::setRelaxNGSchema</methodname>
+   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Set the filename or URI for the RelaxNG Schema to use for validation.
   </para>
diff --git a/reference/xmlreader/xmlreader/setrelaxngschemasource.xml b/reference/xmlreader/xmlreader/setrelaxngschemasource.xml
index 17c7458dbf..4c14e80dc1 100644
--- a/reference/xmlreader/xmlreader/setrelaxngschemasource.xml
+++ b/reference/xmlreader/xmlreader/setrelaxngschemasource.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
-<refentry xml:id="function.xmlreader-setrelaxngschemasource" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.2 $ -->
+<refentry xml:id="xmlreader.setrelaxngschemasource" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>XMLReader::setRelaxNGSchemaSource</refname>
   <refpurpose>Set the data containing a RelaxNG Schema</refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <classsynopsis>
-   <ooclass><classname>XMLReader</classname></ooclass>
-   <methodsynopsis>
-    <type>bool</type>
-    <methodname>setRelaxNGSchemaSource</methodname>
-    <methodparam><type>string</type><parameter>source</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>bool</type>
+   <methodname>XMLReader::setRelaxNGSchemaSource</methodname>
+   <methodparam><type>string</type><parameter>source</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Set the data containing a RelaxNG Schema to use for validation.
   </para>
diff --git a/reference/xmlreader/xmlreader/xml.xml b/reference/xmlreader/xmlreader/xml.xml
index a2f66d6d28..3a44a70fae 100644
--- a/reference/xmlreader/xmlreader/xml.xml
+++ b/reference/xmlreader/xmlreader/xml.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
-<refentry xml:id="function.xmlreader-xml" xmlns="http://docbook.org/ns/docbook">
+<!-- $Revision: 1.2 $ -->
+<refentry xml:id="xmlreader.xml" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>XMLReader::XML</refname>
   <refpurpose>Set the data containing the XML to parse</refpurpose>
@@ -8,16 +8,13 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <classsynopsis>
-   <ooclass><classname>XMLReader</classname></ooclass>
-   <methodsynopsis>
-    <type>bool</type>
-    <methodname>xml</methodname>
-    <methodparam><type>string</type><parameter>source</parameter></methodparam>
-    <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
-    <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
-   </methodsynopsis>
-  </classsynopsis>
+  <methodsynopsis>
+   <type>bool</type>
+   <methodname>XMLReader::xml</methodname>
+   <methodparam><type>string</type><parameter>source</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
+  </methodsynopsis>
   <para>
    Set the data containing the XML to parse.
   </para>