diff --git a/reference/dom/book.xml b/reference/dom/book.xml
index 30c0f34221..1248cc07e8 100644
--- a/reference/dom/book.xml
+++ b/reference/dom/book.xml
@@ -28,6 +28,7 @@
  &reference.dom.constants;
 
  &reference.dom.domattr;
+ &reference.dom.domcdatasection;
  &reference.dom.domcharacterdata;
  &reference.dom.domcomment;
  &reference.dom.domdocument;
diff --git a/reference/dom/domcdatasection.xml b/reference/dom/domcdatasection.xml
index 262f964099..12d2306e51 100644
--- a/reference/dom/domcdatasection.xml
+++ b/reference/dom/domcdatasection.xml
@@ -41,10 +41,17 @@
 
 
     <classsynopsisinfo role="comment">Methods</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.domcdatasection')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.domcdatasection')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])">
+     <xi:fallback />
+    </xi:include>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.domcdatasection')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
+     <xi:fallback />
+    </xi:include>
 
     <classsynopsisinfo role="comment">Inherited methods</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.domtext')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.domtext')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
+     <xi:fallback />
+    </xi:include>
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/dom/domcdatasection/construct.xml b/reference/dom/domcdatasection/construct.xml
index 8d1a60c172..05a10b6af6 100644
--- a/reference/dom/domcdatasection/construct.xml
+++ b/reference/dom/domcdatasection/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <methodname>DOMCdataSection::__construct</methodname>
+  <constructorsynopsis>
+   <modifier>public</modifier> <methodname>DOMCdataSection::__construct</methodname>
    <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Constructs a new CDATA node. This works like the <classname>DOMText</classname>
    class.
@@ -36,20 +36,28 @@
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
-   <example>
+   <example xml:id="domcdatasection.construct.examples.basic">
     <title>Creating a new DOMCdataSection object</title>
     <programlisting role="php">
 <![CDATA[
 <?php
 
-$dom = new DOMDocument('1.0', 'iso-8859-1');
+$dom = new DOMDocument('1.0', 'utf-8');
 $element = $dom->appendChild(new DOMElement('root'));
 $text = $element->appendChild(new DOMCdataSection('root value'));
-echo $dom->saveXML(); /* <?xml version="1.0" encoding="iso-8859-1"?><root><![CDATA[root value]]></root> */
+echo $dom->saveXML();
 
 ?>
 ]]>
     </programlisting>
+    &example.outputs;
+    <!-- Warning: Crazy CDATA markup. Please DO NOT BREAK it. -->
+    <screen>
+<![CDATA[
+<?xml version="1.0" encoding="utf-8"?>
+<root><![CDATA[root value]]]]><![CDATA[></root>
+]]>
+    </screen>
    </example>
   </para>
  </refsect1>
diff --git a/reference/dom/domtext.xml b/reference/dom/domtext.xml
index 728f671bc2..937ba6b65e 100644
--- a/reference/dom/domtext.xml
+++ b/reference/dom/domtext.xml
@@ -50,12 +50,13 @@
     </fieldsynopsis>
  
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.domtext')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.domtext')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.domtext')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
  
 <!-- Again, if the class extends a class use this -->
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.domcharacterdata')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.domnode')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <!--xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.domcharacterdata')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" /-->
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.domnode')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/dom/domtext/construct.xml b/reference/dom/domtext/construct.xml
index bd643d2938..088fca60bd 100644
--- a/reference/dom/domtext/construct.xml
+++ b/reference/dom/domtext/construct.xml
@@ -9,13 +9,10 @@
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
-  <classsynopsis>
-   <ooclass><classname>DOMText</classname></ooclass>
-   <methodsynopsis>
-    <methodname>__construct</methodname>
-    <methodparam choice="opt"><type>string</type><parameter>value</parameter></methodparam>
-   </methodsynopsis> 
-  </classsynopsis>
+  <constructorsynopsis role="oop">
+   <modifier>public</modifier> <methodname>DOMText::__construct</methodname>
+   <methodparam choice="opt"><type>string</type><parameter>value</parameter></methodparam>
+  </constructorsynopsis>
   <para>
    Creates a new <classname>DOMText</classname> object.
   </para>