diff --git a/reference/soap/soapclient.xml b/reference/soap/soapclient.xml
index f850af35ff84..2ae401cc4ccc 100644
--- a/reference/soap/soapclient.xml
+++ b/reference/soap/soapclient.xml
@@ -250,10 +250,10 @@
     </fieldsynopsis>
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.soapclient')/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.soapclient')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='SoapClient'])">
      <xi:fallback/>
     </xi:include>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.soapclient')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.soapclient')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='SoapClient'])">
      <xi:fallback/>
     </xi:include>
    </classsynopsis>
diff --git a/reference/soap/soapclient/call.xml b/reference/soap/soapclient/call.xml
index c99cda5e9fca..398c6ac7eb2d 100644
--- a/reference/soap/soapclient/call.xml
+++ b/reference/soap/soapclient/call.xml
@@ -8,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="SoapClient">
    <modifier>public</modifier> <type>mixed</type><methodname>SoapClient::__call</methodname>
    <methodparam><type>string</type><parameter>name</parameter></methodparam>
    <methodparam><type>array</type><parameter>args</parameter></methodparam>
diff --git a/reference/soap/soapclient/construct.xml b/reference/soap/soapclient/construct.xml
index 5a949473857e..3f2804454246 100644
--- a/reference/soap/soapclient/construct.xml
+++ b/reference/soap/soapclient/construct.xml
@@ -8,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <constructorsynopsis>
+  <constructorsynopsis role="SoapClient">
    <modifier>public</modifier> <methodname>SoapClient::__construct</methodname>
    <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>wsdl</parameter></methodparam>
    <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>[]</initializer></methodparam>
@@ -773,7 +773,6 @@ array(2) {
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/soap/soapclient/dorequest.xml b/reference/soap/soapclient/dorequest.xml
index b268a3e00d75..0f135f7956e6 100644
--- a/reference/soap/soapclient/dorequest.xml
+++ b/reference/soap/soapclient/dorequest.xml
@@ -8,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="SoapClient">
    <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>SoapClient::__doRequest</methodname>
    <methodparam><type>string</type><parameter>request</parameter></methodparam>
    <methodparam><type>string</type><parameter>location</parameter></methodparam>
diff --git a/reference/soap/soapclient/getcookies.xml b/reference/soap/soapclient/getcookies.xml
index c46a2ed6ff91..6b9085f214ef 100644
--- a/reference/soap/soapclient/getcookies.xml
+++ b/reference/soap/soapclient/getcookies.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="soapclient.getcookies" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>SoapClient::__getCookies</refname>
@@ -9,9 +8,9 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="SoapClient">
    <modifier>public</modifier> <type>array</type><methodname>SoapClient::__getCookies</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
 
@@ -34,7 +33,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/soap/soapclient/getfunctions.xml b/reference/soap/soapclient/getfunctions.xml
index c3204afadc1d..55cf2953f415 100644
--- a/reference/soap/soapclient/getfunctions.xml
+++ b/reference/soap/soapclient/getfunctions.xml
@@ -8,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="SoapClient">
    <modifier>public</modifier> <type class="union"><type>array</type><type>null</type></type><methodname>SoapClient::__getFunctions</methodname>
    <void/>
   </methodsynopsis>
diff --git a/reference/soap/soapclient/getlastrequest.xml b/reference/soap/soapclient/getlastrequest.xml
index 5ae466c2a66b..7a4d916ffb02 100644
--- a/reference/soap/soapclient/getlastrequest.xml
+++ b/reference/soap/soapclient/getlastrequest.xml
@@ -8,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="SoapClient">
    <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>SoapClient::__getLastRequest</methodname>
    <void/>
   </methodsynopsis>
diff --git a/reference/soap/soapclient/getlastrequestheaders.xml b/reference/soap/soapclient/getlastrequestheaders.xml
index dd18af7f0665..18529c8c8503 100644
--- a/reference/soap/soapclient/getlastrequestheaders.xml
+++ b/reference/soap/soapclient/getlastrequestheaders.xml
@@ -8,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="SoapClient">
    <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>SoapClient::__getLastRequestHeaders</methodname>
    <void/>
   </methodsynopsis>
diff --git a/reference/soap/soapclient/getlastresponse.xml b/reference/soap/soapclient/getlastresponse.xml
index eaf68216f1de..271822681bd9 100644
--- a/reference/soap/soapclient/getlastresponse.xml
+++ b/reference/soap/soapclient/getlastresponse.xml
@@ -8,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="SoapClient">
    <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>SoapClient::__getLastResponse</methodname>
    <void/>
   </methodsynopsis>
diff --git a/reference/soap/soapclient/getlastresponseheaders.xml b/reference/soap/soapclient/getlastresponseheaders.xml
index a0ba55e74982..682fa06fee10 100644
--- a/reference/soap/soapclient/getlastresponseheaders.xml
+++ b/reference/soap/soapclient/getlastresponseheaders.xml
@@ -8,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="SoapClient">
    <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>SoapClient::__getLastResponseHeaders</methodname>
    <void/>
   </methodsynopsis>
diff --git a/reference/soap/soapclient/gettypes.xml b/reference/soap/soapclient/gettypes.xml
index 25ea00887666..55d1878e0ac3 100644
--- a/reference/soap/soapclient/gettypes.xml
+++ b/reference/soap/soapclient/gettypes.xml
@@ -8,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="SoapClient">
    <modifier>public</modifier> <type class="union"><type>array</type><type>null</type></type><methodname>SoapClient::__getTypes</methodname>
    <void/>
   </methodsynopsis>
diff --git a/reference/soap/soapclient/setcookie.xml b/reference/soap/soapclient/setcookie.xml
index 3aa67b3e2e70..cbcf6f10c1c2 100644
--- a/reference/soap/soapclient/setcookie.xml
+++ b/reference/soap/soapclient/setcookie.xml
@@ -8,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="SoapClient">
    <modifier>public</modifier> <type>void</type><methodname>SoapClient::__setCookie</methodname>
    <methodparam><type>string</type><parameter>name</parameter></methodparam>
    <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>value</parameter><initializer>&null;</initializer></methodparam>
diff --git a/reference/soap/soapclient/setlocation.xml b/reference/soap/soapclient/setlocation.xml
index d1a94bada5aa..cb0f048a8d22 100644
--- a/reference/soap/soapclient/setlocation.xml
+++ b/reference/soap/soapclient/setlocation.xml
@@ -8,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="SoapClient">
    <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>SoapClient::__setLocation</methodname>
    <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>location</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
diff --git a/reference/soap/soapclient/setsoapheaders.xml b/reference/soap/soapclient/setsoapheaders.xml
index 30a5384daae5..e93e27be46da 100644
--- a/reference/soap/soapclient/setsoapheaders.xml
+++ b/reference/soap/soapclient/setsoapheaders.xml
@@ -8,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="SoapClient">
    <modifier>public</modifier> <type>bool</type><methodname>SoapClient::__setSoapHeaders</methodname>
    <methodparam choice="opt"><type class="union"><type>SoapHeader</type><type>array</type><type>null</type></type><parameter>headers</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
diff --git a/reference/soap/soapclient/soapcall.xml b/reference/soap/soapclient/soapcall.xml
index 05f182b0fc75..d8ac2323b497 100644
--- a/reference/soap/soapclient/soapcall.xml
+++ b/reference/soap/soapclient/soapcall.xml
@@ -8,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="SoapClient">
    <modifier>public</modifier> <type>mixed</type><methodname>SoapClient::__soapCall</methodname>
    <methodparam><type>string</type><parameter>name</parameter></methodparam>
    <methodparam><type>array</type><parameter>args</parameter></methodparam>
diff --git a/reference/soap/soapfault.xml b/reference/soap/soapfault.xml
index a3f230558194..e65390033860 100644
--- a/reference/soap/soapfault.xml
+++ b/reference/soap/soapfault.xml
@@ -85,10 +85,10 @@
     </xi:include>
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.soapfault')/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.soapfault')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='SoapFault'])">
      <xi:fallback/>
     </xi:include>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.soapfault')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.soapfault')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='SoapFault'])">
      <xi:fallback/>
     </xi:include>
 
diff --git a/reference/soap/soapfault/construct.xml b/reference/soap/soapfault/construct.xml
index 5db23bb9b450..38d8d35358f0 100644
--- a/reference/soap/soapfault/construct.xml
+++ b/reference/soap/soapfault/construct.xml
@@ -8,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <constructorsynopsis>
+  <constructorsynopsis role="SoapFault">
    <modifier>public</modifier> <methodname>SoapFault::__construct</methodname>
    <methodparam><type class="union"><type>array</type><type>string</type><type>null</type></type><parameter>code</parameter></methodparam>
    <methodparam><type>string</type><parameter>string</parameter></methodparam>
@@ -138,7 +138,6 @@ $server->handle();
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/soap/soapfault/tostring.xml b/reference/soap/soapfault/tostring.xml
index 335532855e4f..35a41738d89d 100644
--- a/reference/soap/soapfault/tostring.xml
+++ b/reference/soap/soapfault/tostring.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="soapfault.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>SoapFault::__toString</refname>
@@ -9,9 +8,9 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="SoapFault">
    <modifier>public</modifier> <type>string</type><methodname>SoapFault::__toString</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
    Returns a string representation of the SoapFault.
@@ -31,7 +30,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/soap/soapheader.xml b/reference/soap/soapheader.xml
index 3da1d68dd2a2..6bf75de4723e 100644
--- a/reference/soap/soapheader.xml
+++ b/reference/soap/soapheader.xml
@@ -60,7 +60,7 @@
     </fieldsynopsis>
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.soapheader')/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.soapheader')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='SoapHeader'])">
      <xi:fallback/>
     </xi:include>
    </classsynopsis>
diff --git a/reference/soap/soapheader/construct.xml b/reference/soap/soapheader/construct.xml
index 9ced6cf601da..4cc9024ac376 100644
--- a/reference/soap/soapheader/construct.xml
+++ b/reference/soap/soapheader/construct.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="soapheader.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>SoapHeader::__construct</refname>
@@ -9,8 +8,8 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <constructorsynopsis>
-   <methodname>SoapHeader::__construct</methodname>
+  <constructorsynopsis role="SoapHeader">
+   <modifier>public</modifier> <methodname>SoapHeader::__construct</methodname>
    <methodparam><type>string</type><parameter>namespace</parameter></methodparam>
    <methodparam><type>string</type><parameter>name</parameter></methodparam>
    <methodparam choice="opt"><type>mixed</type><parameter>data</parameter></methodparam>
diff --git a/reference/soap/soapparam.xml b/reference/soap/soapparam.xml
index 79cc4c77eca6..a0e7e6c57318 100644
--- a/reference/soap/soapparam.xml
+++ b/reference/soap/soapparam.xml
@@ -44,7 +44,7 @@
     </fieldsynopsis>
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.soapparam')/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.soapparam')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='SoapParam'])">
      <xi:fallback/>
     </xi:include>
    </classsynopsis>
diff --git a/reference/soap/soapparam/construct.xml b/reference/soap/soapparam/construct.xml
index 24d28a1108d9..f8abf08769ec 100644
--- a/reference/soap/soapparam/construct.xml
+++ b/reference/soap/soapparam/construct.xml
@@ -8,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <constructorsynopsis>
+  <constructorsynopsis role="SoapParam">
    <modifier>public</modifier> <methodname>SoapParam::__construct</methodname>
    <methodparam><type>mixed</type><parameter>data</parameter></methodparam>
    <methodparam><type>string</type><parameter>name</parameter></methodparam>
@@ -75,7 +75,6 @@ $client->SomeFunction(new SoapParam($a, "a"),
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/soap/soapserver.xml b/reference/soap/soapserver.xml
index ae733b5331ce..cd59cb831671 100644
--- a/reference/soap/soapserver.xml
+++ b/reference/soap/soapserver.xml
@@ -47,10 +47,10 @@
     </fieldsynopsis>
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.soapserver')/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.soapserver')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='SoapServer'])">
      <xi:fallback/>
     </xi:include>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.soapserver')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.soapserver')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='SoapServer'])">
      <xi:fallback/>
     </xi:include>
    </classsynopsis>
diff --git a/reference/soap/soapserver/addfunction.xml b/reference/soap/soapserver/addfunction.xml
index 5becd9c515ba..dfc5516de34b 100644
--- a/reference/soap/soapserver/addfunction.xml
+++ b/reference/soap/soapserver/addfunction.xml
@@ -8,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="SoapServer">
    <modifier>public</modifier> <type>void</type><methodname>SoapServer::addFunction</methodname>
    <methodparam><type class="union"><type>array</type><type>string</type><type>int</type></type><parameter>functions</parameter></methodparam>
   </methodsynopsis>
diff --git a/reference/soap/soapserver/addsoapheader.xml b/reference/soap/soapserver/addsoapheader.xml
index 6a7b23f27843..1640e7ef00a4 100644
--- a/reference/soap/soapserver/addsoapheader.xml
+++ b/reference/soap/soapserver/addsoapheader.xml
@@ -8,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="SoapServer">
    <modifier>public</modifier> <type>void</type><methodname>SoapServer::addSoapHeader</methodname>
    <methodparam><type>SoapHeader</type><parameter>header</parameter></methodparam>
   </methodsynopsis>
diff --git a/reference/soap/soapserver/construct.xml b/reference/soap/soapserver/construct.xml
index 0cdb7732f866..48d799889a1d 100644
--- a/reference/soap/soapserver/construct.xml
+++ b/reference/soap/soapserver/construct.xml
@@ -8,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <constructorsynopsis>
+  <constructorsynopsis role="SoapServer">
    <modifier>public</modifier> <methodname>SoapServer::__construct</methodname>
    <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>wsdl</parameter></methodparam>
    <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>[]</initializer></methodparam>
@@ -120,7 +120,6 @@ $server = new SoapServer("books.wsdl", array('classmap' => array('book' => "MyBo
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/soap/soapserver/fault.xml b/reference/soap/soapserver/fault.xml
index 7d5c595783e5..0c2de236fbba 100644
--- a/reference/soap/soapserver/fault.xml
+++ b/reference/soap/soapserver/fault.xml
@@ -8,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="SoapServer">
    <modifier>public</modifier> <type>void</type><methodname>SoapServer::fault</methodname>
    <methodparam><type>string</type><parameter>code</parameter></methodparam>
    <methodparam><type>string</type><parameter>string</parameter></methodparam>
diff --git a/reference/soap/soapserver/getfunctions.xml b/reference/soap/soapserver/getfunctions.xml
index 61a046bbc497..979071e84553 100644
--- a/reference/soap/soapserver/getfunctions.xml
+++ b/reference/soap/soapserver/getfunctions.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="soapserver.getfunctions" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>SoapServer::getFunctions</refname>
@@ -9,9 +8,9 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="SoapServer">
    <modifier>public</modifier> <type>array</type><methodname>SoapServer::getFunctions</methodname>
-   <void />
+   <void/>
   </methodsynopsis>
   <para>
     Returns a list of the defined functions in the SoapServer object.
@@ -71,7 +70,6 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/soap/soapserver/handle.xml b/reference/soap/soapserver/handle.xml
index 62e0f11d2eaf..85b83c8fea08 100644
--- a/reference/soap/soapserver/handle.xml
+++ b/reference/soap/soapserver/handle.xml
@@ -8,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="SoapServer">
    <modifier>public</modifier> <type>void</type><methodname>SoapServer::handle</methodname>
    <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>request</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
diff --git a/reference/soap/soapserver/setclass.xml b/reference/soap/soapserver/setclass.xml
index de45b9fc16e0..f1a4861079af 100644
--- a/reference/soap/soapserver/setclass.xml
+++ b/reference/soap/soapserver/setclass.xml
@@ -8,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="SoapServer">
    <modifier>public</modifier> <type>void</type><methodname>SoapServer::setClass</methodname>
    <methodparam><type>string</type><parameter>class</parameter></methodparam>
    <methodparam rep="repeat"><type>mixed</type><parameter>args</parameter></methodparam>
diff --git a/reference/soap/soapserver/setobject.xml b/reference/soap/soapserver/setobject.xml
index 658b1a522a56..962b52e58c18 100644
--- a/reference/soap/soapserver/setobject.xml
+++ b/reference/soap/soapserver/setobject.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="soapserver.setobject" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>SoapServer::setObject</refname>
@@ -9,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="SoapServer">
    <modifier>public</modifier> <type>void</type><methodname>SoapServer::setObject</methodname>
    <methodparam><type>object</type><parameter>object</parameter></methodparam>
   </methodsynopsis>
@@ -53,7 +52,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/soap/soapserver/setpersistence.xml b/reference/soap/soapserver/setpersistence.xml
index 22188091a096..d7435b44d278 100644
--- a/reference/soap/soapserver/setpersistence.xml
+++ b/reference/soap/soapserver/setpersistence.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-
 <refentry xml:id="soapserver.setpersistence" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>SoapServer::setPersistence</refname>
@@ -9,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <methodsynopsis role="SoapServer">
    <modifier>public</modifier> <type>void</type><methodname>SoapServer::setPersistence</methodname>
    <methodparam><type>int</type><parameter>mode</parameter></methodparam>
   </methodsynopsis>
@@ -123,7 +122,6 @@
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/soap/soapvar.xml b/reference/soap/soapvar.xml
index 47342b855226..39daf5923b6b 100644
--- a/reference/soap/soapvar.xml
+++ b/reference/soap/soapvar.xml
@@ -69,7 +69,7 @@
     </fieldsynopsis>
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.soapvar')/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.soapvar')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='SoapVar'])">
      <xi:fallback/>
     </xi:include>
    </classsynopsis>
diff --git a/reference/soap/soapvar/construct.xml b/reference/soap/soapvar/construct.xml
index c15c9e155f68..e021bcee7355 100644
--- a/reference/soap/soapvar/construct.xml
+++ b/reference/soap/soapvar/construct.xml
@@ -8,7 +8,7 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <constructorsynopsis>
+  <constructorsynopsis role="SoapVar">
    <modifier>public</modifier> <methodname>SoapVar::__construct</methodname>
    <methodparam><type>mixed</type><parameter>data</parameter></methodparam>
    <methodparam><type class="union"><type>int</type><type>null</type></type><parameter>encoding</parameter></methodparam>