From ecaa2146429a7f88de40dfce14718afc896b74c5 Mon Sep 17 00:00:00 2001
From: George Peter Banyard <girgias@php.net>
Date: Tue, 15 Mar 2022 16:36:11 +0000
Subject: [PATCH] Fix de/constructor synopsis tag usage (#1457)

In Solr, Stomp, Yaf.

Also include constructor and destructor in StreamWrapper interface synopsis
---
 reference/solr/solrclient.xml                       | 4 +++-
 reference/solr/solrclient/construct.xml             | 4 ++--
 reference/solr/solrclient/destruct.xml              | 6 +++---
 reference/solr/solrdismaxquery.xml                  | 1 +
 reference/solr/solrdismaxquery/construct.xml        | 4 ++--
 reference/solr/solrdocument.xml                     | 4 +++-
 reference/solr/solrdocument/construct.xml           | 4 ++--
 reference/solr/solrdocument/destruct.xml            | 6 +++---
 reference/solr/solrdocumentfield.xml                | 3 ++-
 reference/solr/solrdocumentfield/construct.xml      | 4 ++--
 reference/solr/solrdocumentfield/destruct.xml       | 6 +++---
 reference/solr/solrgenericresponse.xml              | 3 ++-
 reference/solr/solrgenericresponse/construct.xml    | 4 ++--
 reference/solr/solrgenericresponse/destruct.xml     | 6 +++---
 reference/solr/solrinputdocument.xml                | 4 +++-
 reference/solr/solrinputdocument/construct.xml      | 4 ++--
 reference/solr/solrinputdocument/destruct.xml       | 6 +++---
 reference/solr/solrmodifiableparams.xml             | 3 ++-
 reference/solr/solrmodifiableparams/construct.xml   | 4 ++--
 reference/solr/solrmodifiableparams/destruct.xml    | 6 +++---
 reference/solr/solrobject.xml                       | 4 +++-
 reference/solr/solrobject/construct.xml             | 4 ++--
 reference/solr/solrobject/destruct.xml              | 6 +++---
 reference/solr/solrpingresponse.xml                 | 4 +++-
 reference/solr/solrpingresponse/construct.xml       | 4 ++--
 reference/solr/solrpingresponse/destruct.xml        | 6 +++---
 reference/solr/solrquery.xml                        | 7 +++++--
 reference/solr/solrquery/construct.xml              | 4 ++--
 reference/solr/solrquery/destruct.xml               | 6 +++---
 reference/solr/solrqueryresponse.xml                | 3 ++-
 reference/solr/solrqueryresponse/construct.xml      | 4 ++--
 reference/solr/solrqueryresponse/destruct.xml       | 6 +++---
 reference/solr/solrupdateresponse.xml               | 3 ++-
 reference/solr/solrupdateresponse/construct.xml     | 4 ++--
 reference/solr/solrupdateresponse/destruct.xml      | 6 +++---
 reference/stomp/stomp.xml                           | 4 +++-
 reference/stomp/stomp/construct.xml                 | 4 ++--
 reference/stomp/stomp/destruct.xml                  | 6 +++---
 reference/stomp/stompframe.xml                      | 2 +-
 reference/stomp/stompframe/construct.xml            | 4 ++--
 reference/stream/streamwrapper.xml                  | 4 +++-
 reference/yaf/yaf-application.xml                   | 4 +++-
 reference/yaf/yaf-config-ini.xml                    | 1 +
 reference/yaf/yaf-config-simple.xml                 | 1 +
 reference/yaf/yaf-controller-abstract.xml           | 1 +
 reference/yaf/yaf-dispatcher.xml                    | 1 +
 reference/yaf/yaf-exception.xml                     | 1 +
 reference/yaf/yaf-loader.xml                        | 1 +
 reference/yaf/yaf-registry.xml                      | 1 +
 reference/yaf/yaf-request-http.xml                  | 1 +
 reference/yaf/yaf-request-simple.xml                | 1 +
 reference/yaf/yaf-response-abstract.xml             | 4 +++-
 reference/yaf/yaf-route-map.xml                     | 1 +
 reference/yaf/yaf-route-regex.xml                   | 1 +
 reference/yaf/yaf-route-rewrite.xml                 | 1 +
 reference/yaf/yaf-route-simple.xml                  | 1 +
 reference/yaf/yaf-route-supervar.xml                | 1 +
 reference/yaf/yaf-router.xml                        | 1 +
 reference/yaf/yaf-session.xml                       | 1 +
 reference/yaf/yaf-view-simple.xml                   | 1 +
 reference/yaf/yaf_application/construct.xml         | 4 ++--
 reference/yaf/yaf_application/destruct.xml          | 6 +++---
 reference/yaf/yaf_config_ini/construct.xml          | 4 ++--
 reference/yaf/yaf_config_simple/construct.xml       | 4 ++--
 reference/yaf/yaf_controller_abstract/construct.xml | 4 ++--
 reference/yaf/yaf_dispatcher/construct.xml          | 4 ++--
 reference/yaf/yaf_exception/construct.xml           | 4 ++--
 reference/yaf/yaf_loader/construct.xml              | 4 ++--
 reference/yaf/yaf_registry/construct.xml            | 4 ++--
 reference/yaf/yaf_request_http/construct.xml        | 4 ++--
 reference/yaf/yaf_request_simple/construct.xml      | 4 ++--
 reference/yaf/yaf_response_abstract/construct.xml   | 4 ++--
 reference/yaf/yaf_response_abstract/destruct.xml    | 6 +++---
 reference/yaf/yaf_route_map/construct.xml           | 4 ++--
 reference/yaf/yaf_route_regex/construct.xml         | 4 ++--
 reference/yaf/yaf_route_rewrite/construct.xml       | 4 ++--
 reference/yaf/yaf_route_simple/construct.xml        | 4 ++--
 reference/yaf/yaf_route_supervar/construct.xml      | 4 ++--
 reference/yaf/yaf_router/construct.xml              | 4 ++--
 reference/yaf/yaf_session/construct.xml             | 4 ++--
 reference/yaf/yaf_view_simple/construct.xml         | 4 ++--
 81 files changed, 169 insertions(+), 125 deletions(-)

diff --git a/reference/solr/solrclient.xml b/reference/solr/solrclient.xml
index 7b6e39e333..90b31a2a26 100644
--- a/reference/solr/solrclient.xml
+++ b/reference/solr/solrclient.xml
@@ -107,7 +107,9 @@
     </fieldsynopsis>
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrclient')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrclient')/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.solrclient')/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.solrclient')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[not(@role='procedural')])" />
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/solr/solrclient/construct.xml b/reference/solr/solrclient/construct.xml
index 277ffd9fc0..882eb9ab6f 100644
--- a/reference/solr/solrclient/construct.xml
+++ b/reference/solr/solrclient/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>SolrClient::__construct</methodname>
    <methodparam><type>array</type><parameter>clientOptions</parameter></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Constructor for the SolrClient object
   </para>
diff --git a/reference/solr/solrclient/destruct.xml b/reference/solr/solrclient/destruct.xml
index 06fc8cbe3a..977a7d3f28 100644
--- a/reference/solr/solrclient/destruct.xml
+++ b/reference/solr/solrclient/destruct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrClient::__destruct</methodname>
+  <destructorsynopsis>
+   <modifier>public</modifier> <methodname>SolrClient::__destruct</methodname>
    <void />
-  </methodsynopsis>
+  </destructorsynopsis>
   <para>
    Destructor
   </para>
diff --git a/reference/solr/solrdismaxquery.xml b/reference/solr/solrdismaxquery.xml
index b187ad5927..7b7fd3530f 100644
--- a/reference/solr/solrdismaxquery.xml
+++ b/reference/solr/solrdismaxquery.xml
@@ -46,6 +46,7 @@
 
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrdismaxquery')/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.solrdismaxquery')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
     
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
diff --git a/reference/solr/solrdismaxquery/construct.xml b/reference/solr/solrdismaxquery/construct.xml
index 54fab52735..b1fc1cc441 100644
--- a/reference/solr/solrdismaxquery/construct.xml
+++ b/reference/solr/solrdismaxquery/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>SolrDisMaxQuery::__construct</methodname>
    <methodparam choice="opt"><type>string</type><parameter>q</parameter></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
     Class constructor initializes the object and sets the q parameter if passed
   </para>
diff --git a/reference/solr/solrdocument.xml b/reference/solr/solrdocument.xml
index 2b43b57d8e..7160a3ad07 100644
--- a/reference/solr/solrdocument.xml
+++ b/reference/solr/solrdocument.xml
@@ -83,7 +83,9 @@
     </fieldsynopsis>
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrdocument')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrdocument')/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.solrdocument')/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.solrdocument')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[not(@role='procedural')])"/>
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/solr/solrdocument/construct.xml b/reference/solr/solrdocument/construct.xml
index 86ab9fb520..35b28f6432 100644
--- a/reference/solr/solrdocument/construct.xml
+++ b/reference/solr/solrdocument/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>SolrDocument::__construct</methodname>
    <void />
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Constructor for SolrDocument
   </para>
diff --git a/reference/solr/solrdocument/destruct.xml b/reference/solr/solrdocument/destruct.xml
index 07b53374a7..3ac50ed5d3 100644
--- a/reference/solr/solrdocument/destruct.xml
+++ b/reference/solr/solrdocument/destruct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrDocument::__destruct</methodname>
+  <destructorsynopsis>
+   <modifier>public</modifier> <methodname>SolrDocument::__destruct</methodname>
    <void />
-  </methodsynopsis>
+  </destructorsynopsis>
   <para>
    Destructor for SolrDocument.
   </para>
diff --git a/reference/solr/solrdocumentfield.xml b/reference/solr/solrdocumentfield.xml
index 6983343d2f..50db652fa3 100644
--- a/reference/solr/solrdocumentfield.xml
+++ b/reference/solr/solrdocumentfield.xml
@@ -54,7 +54,8 @@
 
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrdocumentfield')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrdocumentfield')/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.solrdocumentfield')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[not(@role='procedural')])" />
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/solr/solrdocumentfield/construct.xml b/reference/solr/solrdocumentfield/construct.xml
index 3eb78a3d29..6def2fdca3 100644
--- a/reference/solr/solrdocumentfield/construct.xml
+++ b/reference/solr/solrdocumentfield/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>SolrDocumentField::__construct</methodname>
    <void />
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Constructor.
   </para>
diff --git a/reference/solr/solrdocumentfield/destruct.xml b/reference/solr/solrdocumentfield/destruct.xml
index d88bd1d109..8dc732c399 100644
--- a/reference/solr/solrdocumentfield/destruct.xml
+++ b/reference/solr/solrdocumentfield/destruct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrDocumentField::__destruct</methodname>
+  <destructorsynopsis>
+   <modifier>public</modifier> <methodname>SolrDocumentField::__destruct</methodname>
    <void />
-  </methodsynopsis>
+  </destructorsynopsis>
   <para>
    Destructor.
   </para>
diff --git a/reference/solr/solrgenericresponse.xml b/reference/solr/solrgenericresponse.xml
index 14db288e24..97f026d332 100644
--- a/reference/solr/solrgenericresponse.xml
+++ b/reference/solr/solrgenericresponse.xml
@@ -55,7 +55,8 @@
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('solrresponse.synopsis')/descendant::db:fieldsynopsis)" />
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrgenericresponse')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrgenericresponse')/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.solrgenericresponse')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[not(@role='procedural')])" />
     
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrresponse')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
diff --git a/reference/solr/solrgenericresponse/construct.xml b/reference/solr/solrgenericresponse/construct.xml
index 2394e96332..34f6890921 100644
--- a/reference/solr/solrgenericresponse/construct.xml
+++ b/reference/solr/solrgenericresponse/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>SolrGenericResponse::__construct</methodname>
    <void />
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Constructor
   </para> 
diff --git a/reference/solr/solrgenericresponse/destruct.xml b/reference/solr/solrgenericresponse/destruct.xml
index 0d982f3b41..b742e91240 100644
--- a/reference/solr/solrgenericresponse/destruct.xml
+++ b/reference/solr/solrgenericresponse/destruct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrGenericResponse::__destruct</methodname>
+  <destructorsynopsis>
+   <modifier>public</modifier> <methodname>SolrGenericResponse::__destruct</methodname>
    <void />
-  </methodsynopsis>
+  </destructorsynopsis>
   <para>
    Destructor.
   </para>
diff --git a/reference/solr/solrinputdocument.xml b/reference/solr/solrinputdocument.xml
index 85a86cd0a1..b8a2ca2561 100644
--- a/reference/solr/solrinputdocument.xml
+++ b/reference/solr/solrinputdocument.xml
@@ -71,7 +71,9 @@
     </fieldsynopsis>
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrinputdocument')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrinputdocument')/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.solrinputdocument')/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.solrinputdocument')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[not(@role='procedural')])"/>
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/solr/solrinputdocument/construct.xml b/reference/solr/solrinputdocument/construct.xml
index fa328c5a78..cd62c7b62c 100644
--- a/reference/solr/solrinputdocument/construct.xml
+++ b/reference/solr/solrinputdocument/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>SolrInputDocument::__construct</methodname>
    <void />
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Constructor.
   </para>
diff --git a/reference/solr/solrinputdocument/destruct.xml b/reference/solr/solrinputdocument/destruct.xml
index b12b151398..3e7649fe3f 100644
--- a/reference/solr/solrinputdocument/destruct.xml
+++ b/reference/solr/solrinputdocument/destruct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrInputDocument::__destruct</methodname>
+  <destructorsynopsis>
+   <modifier>public</modifier> <methodname>SolrInputDocument::__destruct</methodname>
    <void />
-  </methodsynopsis>
+  </destructorsynopsis>
   <para>
    Destructor
   </para>
diff --git a/reference/solr/solrmodifiableparams.xml b/reference/solr/solrmodifiableparams.xml
index de322fa5f9..1f2760bfc0 100644
--- a/reference/solr/solrmodifiableparams.xml
+++ b/reference/solr/solrmodifiableparams.xml
@@ -42,7 +42,8 @@
 <!-- }}} -->
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrmodifiableparams')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrmodifiableparams')/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.solrmodifiableparams')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[not(@role='procedural')])"/>
     
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrparams')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
diff --git a/reference/solr/solrmodifiableparams/construct.xml b/reference/solr/solrmodifiableparams/construct.xml
index 01777126ff..c4c1f164b4 100644
--- a/reference/solr/solrmodifiableparams/construct.xml
+++ b/reference/solr/solrmodifiableparams/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>SolrModifiableParams::__construct</methodname>
    <void />
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Constructor
   </para>
diff --git a/reference/solr/solrmodifiableparams/destruct.xml b/reference/solr/solrmodifiableparams/destruct.xml
index 65ee583c45..60f3181932 100644
--- a/reference/solr/solrmodifiableparams/destruct.xml
+++ b/reference/solr/solrmodifiableparams/destruct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrModifiableParams::__destruct</methodname>
+  <destructorsynopsis>
+   <modifier>public</modifier> <methodname>SolrModifiableParams::__destruct</methodname>
    <void />
-  </methodsynopsis>
+  </destructorsynopsis>
   <para>
    Destructor
   </para>
diff --git a/reference/solr/solrobject.xml b/reference/solr/solrobject.xml
index 64f571a7f4..b6c414ce1f 100644
--- a/reference/solr/solrobject.xml
+++ b/reference/solr/solrobject.xml
@@ -38,7 +38,9 @@
 <!-- }}} -->
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrobject')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrobject')/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.solrobject')/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.solrobject')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[not(@role='procedural')])"/>
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/solr/solrobject/construct.xml b/reference/solr/solrobject/construct.xml
index 6b6b46681a..19ddfd32e4 100644
--- a/reference/solr/solrobject/construct.xml
+++ b/reference/solr/solrobject/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>SolrObject::__construct</methodname>
    <void />
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Creates Solr object.
   </para>
diff --git a/reference/solr/solrobject/destruct.xml b/reference/solr/solrobject/destruct.xml
index cf5625996c..2c9ac14018 100644
--- a/reference/solr/solrobject/destruct.xml
+++ b/reference/solr/solrobject/destruct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrObject::__destruct</methodname>
+  <destructorsynopsis>
+   <modifier>public</modifier> <methodname>SolrObject::__destruct</methodname>
    <void />
-  </methodsynopsis>
+  </destructorsynopsis>
   <para>
    The destructor
   </para>
diff --git a/reference/solr/solrpingresponse.xml b/reference/solr/solrpingresponse.xml
index 4ca93ee6db..9fba6cc6ef 100644
--- a/reference/solr/solrpingresponse.xml
+++ b/reference/solr/solrpingresponse.xml
@@ -55,7 +55,9 @@
 
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrpingresponse')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrpingresponse')/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.solrpingresponse')/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.solrpingresponse')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[not(@role='procedural')])"/>
     
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrresponse')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
diff --git a/reference/solr/solrpingresponse/construct.xml b/reference/solr/solrpingresponse/construct.xml
index 6941c22407..b675465cca 100644
--- a/reference/solr/solrpingresponse/construct.xml
+++ b/reference/solr/solrpingresponse/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>SolrPingResponse::__construct</methodname>
    <void />
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Constructor
   </para>
diff --git a/reference/solr/solrpingresponse/destruct.xml b/reference/solr/solrpingresponse/destruct.xml
index 2338423957..d52c0e201a 100644
--- a/reference/solr/solrpingresponse/destruct.xml
+++ b/reference/solr/solrpingresponse/destruct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrPingResponse::__destruct</methodname>
+  <destructorsynopsis>
+   <modifier>public</modifier> <methodname>SolrPingResponse::__destruct</methodname>
    <void />
-  </methodsynopsis>
+  </destructorsynopsis>
   <para>
    Destructor
   </para>
diff --git a/reference/solr/solrquery.xml b/reference/solr/solrquery.xml
index e03e24166d..27f150e7a7 100644
--- a/reference/solr/solrquery.xml
+++ b/reference/solr/solrquery.xml
@@ -82,10 +82,13 @@
 
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrquery')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrquery')/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.solrquery')/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.solrquery')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[not(@role='procedural')])"/>
     
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrmodifiableparams')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrmodifiableparams')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[1])"/>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrmodifiableparams')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[1])"/>
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/solr/solrquery/construct.xml b/reference/solr/solrquery/construct.xml
index 21e7a702f4..3df5bbbf26 100644
--- a/reference/solr/solrquery/construct.xml
+++ b/reference/solr/solrquery/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>SolrQuery::__construct</methodname>
    <methodparam choice="opt"><type>string</type><parameter>q</parameter></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Constructor.
   </para>
diff --git a/reference/solr/solrquery/destruct.xml b/reference/solr/solrquery/destruct.xml
index 3a643c80f7..8da07b5458 100644
--- a/reference/solr/solrquery/destruct.xml
+++ b/reference/solr/solrquery/destruct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrQuery::__destruct</methodname>
+  <destructorsynopsis>
+   <modifier>public</modifier> <methodname>SolrQuery::__destruct</methodname>
    <void />
-  </methodsynopsis>
+  </destructorsynopsis>
   <para>
    Destructor
   </para>
diff --git a/reference/solr/solrqueryresponse.xml b/reference/solr/solrqueryresponse.xml
index 10eb8e3225..07b5162bc5 100644
--- a/reference/solr/solrqueryresponse.xml
+++ b/reference/solr/solrqueryresponse.xml
@@ -55,7 +55,8 @@
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('solrresponse.synopsis')/descendant::db:fieldsynopsis)" />
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrqueryresponse')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrqueryresponse')/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.solrqueryresponse')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[not(@role='procedural')])" />
     
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrresponse')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
diff --git a/reference/solr/solrqueryresponse/construct.xml b/reference/solr/solrqueryresponse/construct.xml
index 798f56ab60..ff97d7a5d9 100644
--- a/reference/solr/solrqueryresponse/construct.xml
+++ b/reference/solr/solrqueryresponse/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>SolrQueryResponse::__construct</methodname>
    <void />
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Constructor
   </para>
diff --git a/reference/solr/solrqueryresponse/destruct.xml b/reference/solr/solrqueryresponse/destruct.xml
index 233959e8cd..e0e0509fd0 100644
--- a/reference/solr/solrqueryresponse/destruct.xml
+++ b/reference/solr/solrqueryresponse/destruct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrQueryResponse::__destruct</methodname>
+  <destructorsynopsis>
+   <modifier>public</modifier> <methodname>SolrQueryResponse::__destruct</methodname>
    <void />
-  </methodsynopsis>
+  </destructorsynopsis>
   <para>
    Destructor.
   </para>
diff --git a/reference/solr/solrupdateresponse.xml b/reference/solr/solrupdateresponse.xml
index 6cf6a9933a..c02288a42a 100644
--- a/reference/solr/solrupdateresponse.xml
+++ b/reference/solr/solrupdateresponse.xml
@@ -55,7 +55,8 @@
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('solrresponse.synopsis')/descendant::db:fieldsynopsis)" />
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrupdateresponse')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrupdateresponse')/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.solrupdateresponse')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[not(@role='procedural')])" />
     
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrresponse')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
diff --git a/reference/solr/solrupdateresponse/construct.xml b/reference/solr/solrupdateresponse/construct.xml
index dfe0d414fe..9a148cad36 100644
--- a/reference/solr/solrupdateresponse/construct.xml
+++ b/reference/solr/solrupdateresponse/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>SolrUpdateResponse::__construct</methodname>
    <void />
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Constructor
   </para>
diff --git a/reference/solr/solrupdateresponse/destruct.xml b/reference/solr/solrupdateresponse/destruct.xml
index fa9c4408b8..a0bf1ce4a2 100644
--- a/reference/solr/solrupdateresponse/destruct.xml
+++ b/reference/solr/solrupdateresponse/destruct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrUpdateResponse::__destruct</methodname>
+  <destructorsynopsis>
+   <modifier>public</modifier> <methodname>SolrUpdateResponse::__destruct</methodname>
    <void />
-  </methodsynopsis>
+  </destructorsynopsis>
   <para>
    Destructor
   </para>
diff --git a/reference/stomp/stomp.xml b/reference/stomp/stomp.xml
index 99135208bb..9ac99e174e 100644
--- a/reference/stomp/stomp.xml
+++ b/reference/stomp/stomp.xml
@@ -33,7 +33,9 @@ Represents a connection between PHP and a Stomp compliant Message Broker.
 <!-- }}} -->
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.stomp')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.stomp')/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.stomp')/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.stomp')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[not(@role='procedural')])" />
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/stomp/stomp/construct.xml b/reference/stomp/stomp/construct.xml
index 509e46f4bc..19c0260981 100644
--- a/reference/stomp/stomp/construct.xml
+++ b/reference/stomp/stomp/construct.xml
@@ -11,13 +11,13 @@
  <refsect1 role="description">
   &reftitle.description;
   <para>&style.oop; (constructor):</para>
-   <methodsynopsis>
+   <constructorsynopsis>
     <modifier>public</modifier> <methodname>Stomp::__construct</methodname>
     <methodparam choice="opt"><type>string</type><parameter>broker</parameter><initializer>ini_get("stomp.default_broker_uri")</initializer></methodparam>
     <methodparam choice="opt"><type>string</type><parameter>username</parameter></methodparam>
     <methodparam choice="opt"><type>string</type><parameter>password</parameter></methodparam>
     <methodparam choice="opt"><type>array</type><parameter>headers</parameter></methodparam>
-   </methodsynopsis>
+   </constructorsynopsis>
   <para>&style.procedural;:</para>
    <methodsynopsis>
     <type>resource</type><methodname>stomp_connect</methodname>
diff --git a/reference/stomp/stomp/destruct.xml b/reference/stomp/stomp/destruct.xml
index aed8c762e3..fd85c5721b 100644
--- a/reference/stomp/stomp/destruct.xml
+++ b/reference/stomp/stomp/destruct.xml
@@ -11,10 +11,10 @@
  <refsect1 role="description">
   &reftitle.description;
   <para>&style.oop; (destructor):</para>
-   <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Stomp::__destruct</methodname>
+   <destructorsynopsis>
+   <modifier>public</modifier> <methodname>Stomp::__destruct</methodname>
    <void />
-   </methodsynopsis>
+   </destructorsynopsis>
   <para>&style.procedural;:</para>
   <methodsynopsis>
    <type>bool</type><methodname>stomp_close</methodname>
diff --git a/reference/stomp/stompframe.xml b/reference/stomp/stompframe.xml
index b647771a30..0648728bfe 100644
--- a/reference/stomp/stompframe.xml
+++ b/reference/stomp/stompframe.xml
@@ -47,7 +47,7 @@
 
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.stompframe')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.stompframe')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])"/>
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/stomp/stompframe/construct.xml b/reference/stomp/stompframe/construct.xml
index cc17c14f4e..f8fc3edf97 100644
--- a/reference/stomp/stompframe/construct.xml
+++ b/reference/stomp/stompframe/construct.xml
@@ -9,12 +9,12 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <methodname>StompFrame::__construct</methodname>
    <methodparam choice="opt"><type>string</type><parameter>command</parameter></methodparam>
    <methodparam choice="opt"><type>array</type><parameter>headers</parameter></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>body</parameter></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Constructor.
   </para>
diff --git a/reference/stream/streamwrapper.xml b/reference/stream/streamwrapper.xml
index 705590fbf9..214cd4f65f 100644
--- a/reference/stream/streamwrapper.xml
+++ b/reference/stream/streamwrapper.xml
@@ -58,7 +58,9 @@
 
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.streamwrapper')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.streamwrapper')/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.streamwrapper')/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.streamwrapper')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[not(@role='procedural')])" />
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/yaf/yaf-application.xml b/reference/yaf/yaf-application.xml
index e6a9e92f08..526c45b1c7 100644
--- a/reference/yaf/yaf-application.xml
+++ b/reference/yaf/yaf-application.xml
@@ -79,7 +79,9 @@
 
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-application')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-application')/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.yaf-application')/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.yaf-application')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[not(@role='procedural')])" />
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/yaf/yaf-config-ini.xml b/reference/yaf/yaf-config-ini.xml
index 45a2431c91..9d0e44d29c 100644
--- a/reference/yaf/yaf-config-ini.xml
+++ b/reference/yaf/yaf-config-ini.xml
@@ -68,6 +68,7 @@
 
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-config-ini')/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.yaf-config-ini')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
     
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
diff --git a/reference/yaf/yaf-config-simple.xml b/reference/yaf/yaf-config-simple.xml
index 5b6f24f58b..def9366e0d 100644
--- a/reference/yaf/yaf-config-simple.xml
+++ b/reference/yaf/yaf-config-simple.xml
@@ -56,6 +56,7 @@
 
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-config-simple')/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.yaf-config-simple')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
     
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
diff --git a/reference/yaf/yaf-controller-abstract.xml b/reference/yaf/yaf-controller-abstract.xml
index 931152fc8c..c023414f4d 100644
--- a/reference/yaf/yaf-controller-abstract.xml
+++ b/reference/yaf/yaf-controller-abstract.xml
@@ -92,6 +92,7 @@
 
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-controller-abstract')/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.yaf-controller-abstract')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/yaf/yaf-dispatcher.xml b/reference/yaf/yaf-dispatcher.xml
index 249f05fe29..95b81be548 100644
--- a/reference/yaf/yaf-dispatcher.xml
+++ b/reference/yaf/yaf-dispatcher.xml
@@ -90,6 +90,7 @@
 
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-dispatcher')/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.yaf-dispatcher')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/yaf/yaf-exception.xml b/reference/yaf/yaf-exception.xml
index 2bcc4f272c..61fe42842d 100644
--- a/reference/yaf/yaf-exception.xml
+++ b/reference/yaf/yaf-exception.xml
@@ -40,6 +40,7 @@
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-exception')/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.yaf-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
     
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
diff --git a/reference/yaf/yaf-loader.xml b/reference/yaf/yaf-loader.xml
index 50e6cb40b3..14073cee7d 100644
--- a/reference/yaf/yaf-loader.xml
+++ b/reference/yaf/yaf-loader.xml
@@ -226,6 +226,7 @@ class A_B_TestModel =>
 
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-loader')/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.yaf-loader')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/yaf/yaf-registry.xml b/reference/yaf/yaf-registry.xml
index 7111d4e8a3..5e3c3fd66b 100644
--- a/reference/yaf/yaf-registry.xml
+++ b/reference/yaf/yaf-registry.xml
@@ -45,6 +45,7 @@
 
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-registry')/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.yaf-registry')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/yaf/yaf-request-http.xml b/reference/yaf/yaf-request-http.xml
index 33d489a56d..57e0614bcc 100644
--- a/reference/yaf/yaf-request-http.xml
+++ b/reference/yaf/yaf-request-http.xml
@@ -60,6 +60,7 @@
 
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-request-http')/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.yaf-request-http')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
     
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
diff --git a/reference/yaf/yaf-request-simple.xml b/reference/yaf/yaf-request-simple.xml
index ff3fc3a471..2d35ad04c5 100644
--- a/reference/yaf/yaf-request-simple.xml
+++ b/reference/yaf/yaf-request-simple.xml
@@ -55,6 +55,7 @@
 
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-request-simple')/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.yaf-request-simple')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
     
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
diff --git a/reference/yaf/yaf-response-abstract.xml b/reference/yaf/yaf-response-abstract.xml
index e9c6bffc6c..e18db65b83 100644
--- a/reference/yaf/yaf-response-abstract.xml
+++ b/reference/yaf/yaf-response-abstract.xml
@@ -55,7 +55,9 @@
 
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-response-abstract')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-response-abstract')/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.yaf-response-abstract')/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.yaf-response-abstract')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[not(@role='procedural')])" />
    </classsynopsis>
 <!-- }}} -->
 
diff --git a/reference/yaf/yaf-route-map.xml b/reference/yaf/yaf-route-map.xml
index 95aaa5c014..a9ce072cfc 100644
--- a/reference/yaf/yaf-route-map.xml
+++ b/reference/yaf/yaf-route-map.xml
@@ -62,6 +62,7 @@
 
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-route-map')/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.yaf-route-map')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/yaf/yaf-route-regex.xml b/reference/yaf/yaf-route-regex.xml
index 6f401da6fa..81ec0b6ee7 100644
--- a/reference/yaf/yaf-route-regex.xml
+++ b/reference/yaf/yaf-route-regex.xml
@@ -61,6 +61,7 @@
 
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-route-regex')/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.yaf-route-regex')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
     
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
diff --git a/reference/yaf/yaf-route-rewrite.xml b/reference/yaf/yaf-route-rewrite.xml
index ff288876c3..92fcf3547e 100644
--- a/reference/yaf/yaf-route-rewrite.xml
+++ b/reference/yaf/yaf-route-rewrite.xml
@@ -57,6 +57,7 @@
 
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-route-rewrite')/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.yaf-route-rewrite')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
     
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
diff --git a/reference/yaf/yaf-route-simple.xml b/reference/yaf/yaf-route-simple.xml
index e0b00d3652..dc33fe8105 100644
--- a/reference/yaf/yaf-route-simple.xml
+++ b/reference/yaf/yaf-route-simple.xml
@@ -62,6 +62,7 @@
 
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-route-simple')/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.yaf-route-simple')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/yaf/yaf-route-supervar.xml b/reference/yaf/yaf-route-supervar.xml
index 2122916017..b64c4f0635 100644
--- a/reference/yaf/yaf-route-supervar.xml
+++ b/reference/yaf/yaf-route-supervar.xml
@@ -43,6 +43,7 @@
 
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-route-supervar')/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.yaf-route-supervar')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/yaf/yaf-router.xml b/reference/yaf/yaf-router.xml
index 65c5908256..c066257a19 100644
--- a/reference/yaf/yaf-router.xml
+++ b/reference/yaf/yaf-router.xml
@@ -177,6 +177,7 @@ http://example/blog/archive/list/sort/alpha/date/desc
 
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-router')/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.yaf-router')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/yaf/yaf-session.xml b/reference/yaf/yaf-session.xml
index 93f3f64777..b7890448f1 100644
--- a/reference/yaf/yaf-session.xml
+++ b/reference/yaf/yaf-session.xml
@@ -60,6 +60,7 @@
 
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-session')/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.yaf-session')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/yaf/yaf-view-simple.xml b/reference/yaf/yaf-view-simple.xml
index 032493b687..cca22750dc 100644
--- a/reference/yaf/yaf-view-simple.xml
+++ b/reference/yaf/yaf-view-simple.xml
@@ -49,6 +49,7 @@
 
     
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-view-simple')/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.yaf-view-simple')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/yaf/yaf_application/construct.xml b/reference/yaf/yaf_application/construct.xml
index 0e8c32f09b..8c61b2f9e5 100644
--- a/reference/yaf/yaf_application/construct.xml
+++ b/reference/yaf/yaf_application/construct.xml
@@ -9,11 +9,11 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>Yaf_Application::__construct</methodname>
    <methodparam><type>mixed</type><parameter>config</parameter></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>envrion</parameter></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    Instance a <classname>Yaf_Application</classname>.
   </para>
diff --git a/reference/yaf/yaf_application/destruct.xml b/reference/yaf/yaf_application/destruct.xml
index 02d71173ee..10030354ed 100644
--- a/reference/yaf/yaf_application/destruct.xml
+++ b/reference/yaf/yaf_application/destruct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Yaf_Application::__destruct</methodname>
+  <destructorsynopsis>
+   <modifier>public</modifier> <methodname>Yaf_Application::__destruct</methodname>
    <void />
-  </methodsynopsis>
+  </destructorsynopsis>
   <para>
 
   </para>
diff --git a/reference/yaf/yaf_config_ini/construct.xml b/reference/yaf/yaf_config_ini/construct.xml
index 860a6a83dc..1753b215f8 100644
--- a/reference/yaf/yaf_config_ini/construct.xml
+++ b/reference/yaf/yaf_config_ini/construct.xml
@@ -9,11 +9,11 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>Yaf_Config_Ini::__construct</methodname>
    <methodparam><type>string</type><parameter>config_file</parameter></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>section</parameter></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
     <classname>Yaf_Config_Ini</classname> constructor
   </para>
diff --git a/reference/yaf/yaf_config_simple/construct.xml b/reference/yaf/yaf_config_simple/construct.xml
index d5c3c3add3..8d9850ae87 100644
--- a/reference/yaf/yaf_config_simple/construct.xml
+++ b/reference/yaf/yaf_config_simple/construct.xml
@@ -9,11 +9,11 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>Yaf_Config_Simple::__construct</methodname>
    <methodparam><type>array</type><parameter>configs</parameter></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>readonly</parameter><initializer>false</initializer></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
     
   </para>
diff --git a/reference/yaf/yaf_controller_abstract/construct.xml b/reference/yaf/yaf_controller_abstract/construct.xml
index 728e95d9d7..2c156d1897 100644
--- a/reference/yaf/yaf_controller_abstract/construct.xml
+++ b/reference/yaf/yaf_controller_abstract/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>final</modifier> <modifier>private</modifier> <methodname>Yaf_Controller_Abstract::__construct</methodname>
    <void />
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
     <methodname>Yaf_Controller_Abstract::__construct</methodname> is final,
     which means it can not be overridden.
diff --git a/reference/yaf/yaf_dispatcher/construct.xml b/reference/yaf/yaf_dispatcher/construct.xml
index 8d5085ecb1..2271e70bdf 100644
--- a/reference/yaf/yaf_dispatcher/construct.xml
+++ b/reference/yaf/yaf_dispatcher/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>Yaf_Dispatcher::__construct</methodname>
    <void />
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
 
   </para>
diff --git a/reference/yaf/yaf_exception/construct.xml b/reference/yaf/yaf_exception/construct.xml
index 008dd899d7..26d88e1db0 100644
--- a/reference/yaf/yaf_exception/construct.xml
+++ b/reference/yaf/yaf_exception/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>Yaf_Exception::__construct</methodname>
    <void />
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
 
   </para>
diff --git a/reference/yaf/yaf_loader/construct.xml b/reference/yaf/yaf_loader/construct.xml
index 8da3c1e0d5..e32393e174 100644
--- a/reference/yaf/yaf_loader/construct.xml
+++ b/reference/yaf/yaf_loader/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>private</modifier> <methodname>Yaf_Loader::__construct</methodname>
    <void />
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
 
   </para>
diff --git a/reference/yaf/yaf_registry/construct.xml b/reference/yaf/yaf_registry/construct.xml
index 901935023b..7018c296f0 100644
--- a/reference/yaf/yaf_registry/construct.xml
+++ b/reference/yaf/yaf_registry/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>private</modifier> <methodname>Yaf_Registry::__construct</methodname>
    <void />
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
 
   </para>
diff --git a/reference/yaf/yaf_request_http/construct.xml b/reference/yaf/yaf_request_http/construct.xml
index acebc0d144..46bbae3e9c 100644
--- a/reference/yaf/yaf_request_http/construct.xml
+++ b/reference/yaf/yaf_request_http/construct.xml
@@ -9,11 +9,11 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>Yaf_Request_Http::__construct</methodname>
    <methodparam choice="opt"><type>string</type><parameter>request_uri</parameter></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>base_uri</parameter></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
 
   </para>
diff --git a/reference/yaf/yaf_request_simple/construct.xml b/reference/yaf/yaf_request_simple/construct.xml
index 7414fde365..27d68be2b5 100644
--- a/reference/yaf/yaf_request_simple/construct.xml
+++ b/reference/yaf/yaf_request_simple/construct.xml
@@ -9,14 +9,14 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>Yaf_Request_Simple::__construct</methodname>
    <methodparam choice="opt"><type>string</type><parameter>method</parameter></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>module</parameter></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>controller</parameter></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>action</parameter></methodparam>
    <methodparam choice="opt"><type>array</type><parameter>params</parameter></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
   </para>
 
diff --git a/reference/yaf/yaf_response_abstract/construct.xml b/reference/yaf/yaf_response_abstract/construct.xml
index 9572239cfc..f0ea534ba3 100644
--- a/reference/yaf/yaf_response_abstract/construct.xml
+++ b/reference/yaf/yaf_response_abstract/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>Yaf_Response_Abstract::__construct</methodname>
    <void />
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
 
   </para>
diff --git a/reference/yaf/yaf_response_abstract/destruct.xml b/reference/yaf/yaf_response_abstract/destruct.xml
index 15ce032e2e..a85ef4d962 100644
--- a/reference/yaf/yaf_response_abstract/destruct.xml
+++ b/reference/yaf/yaf_response_abstract/destruct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Yaf_Response_Abstract::__destruct</methodname>
+  <destructorsynopsis>
+   <modifier>public</modifier> <methodname>Yaf_Response_Abstract::__destruct</methodname>
    <void />
-  </methodsynopsis>
+  </destructorsynopsis>
   <para>
 
   </para>
diff --git a/reference/yaf/yaf_route_map/construct.xml b/reference/yaf/yaf_route_map/construct.xml
index 842836e2d7..0130b8a542 100644
--- a/reference/yaf/yaf_route_map/construct.xml
+++ b/reference/yaf/yaf_route_map/construct.xml
@@ -9,11 +9,11 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>Yaf_Route_Map::__construct</methodname>
    <methodparam choice="opt"><type>string</type><parameter>controller_prefer</parameter><initializer>&false;</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>delimiter</parameter><initializer>""</initializer></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
 
   </para>
diff --git a/reference/yaf/yaf_route_regex/construct.xml b/reference/yaf/yaf_route_regex/construct.xml
index 446eea7f93..6c282359cd 100644
--- a/reference/yaf/yaf_route_regex/construct.xml
+++ b/reference/yaf/yaf_route_regex/construct.xml
@@ -9,14 +9,14 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>Yaf_Route_Regex::__construct</methodname>
    <methodparam><type>string</type><parameter>match</parameter></methodparam>
    <methodparam><type>array</type><parameter>route</parameter></methodparam>
    <methodparam choice="opt"><type>array</type><parameter>map</parameter></methodparam>
    <methodparam choice="opt"><type>array</type><parameter>verify</parameter></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>reverse</parameter></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
   </para>
 
diff --git a/reference/yaf/yaf_route_rewrite/construct.xml b/reference/yaf/yaf_route_rewrite/construct.xml
index 9c3d211d1e..4d881f4517 100644
--- a/reference/yaf/yaf_route_rewrite/construct.xml
+++ b/reference/yaf/yaf_route_rewrite/construct.xml
@@ -9,12 +9,12 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>Yaf_Route_Rewrite::__construct</methodname>
    <methodparam><type>string</type><parameter>match</parameter></methodparam>
    <methodparam><type>array</type><parameter>route</parameter></methodparam>
    <methodparam choice="opt"><type>array</type><parameter>verify</parameter></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
 
   </para>
diff --git a/reference/yaf/yaf_route_simple/construct.xml b/reference/yaf/yaf_route_simple/construct.xml
index 4b088ec81d..d4105f2541 100644
--- a/reference/yaf/yaf_route_simple/construct.xml
+++ b/reference/yaf/yaf_route_simple/construct.xml
@@ -9,12 +9,12 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>Yaf_Route_Simple::__construct</methodname>
    <methodparam><type>string</type><parameter>module_name</parameter></methodparam>
    <methodparam><type>string</type><parameter>controller_name</parameter></methodparam>
    <methodparam><type>string</type><parameter>action_name</parameter></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    <classname>Yaf_Route_Simple</classname> will get route info from query
    string. and the parameters of this constructor will used as keys while searching for the
diff --git a/reference/yaf/yaf_route_supervar/construct.xml b/reference/yaf/yaf_route_supervar/construct.xml
index d8aa0d0fab..82764f42d8 100644
--- a/reference/yaf/yaf_route_supervar/construct.xml
+++ b/reference/yaf/yaf_route_supervar/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>Yaf_Route_Supervar::__construct</methodname>
    <methodparam><type>string</type><parameter>supervar_name</parameter></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
    <classname>Yaf_Route_Supervar</classname> is similar with
    <classname>Yaf_Route_Static</classname>, the difference is
diff --git a/reference/yaf/yaf_router/construct.xml b/reference/yaf/yaf_router/construct.xml
index dda3e1b241..ce4da6b86b 100644
--- a/reference/yaf/yaf_router/construct.xml
+++ b/reference/yaf/yaf_router/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>public</modifier> <methodname>Yaf_Router::__construct</methodname>
    <void />
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
 
   </para>
diff --git a/reference/yaf/yaf_session/construct.xml b/reference/yaf/yaf_session/construct.xml
index f875c63714..241823defc 100644
--- a/reference/yaf/yaf_session/construct.xml
+++ b/reference/yaf/yaf_session/construct.xml
@@ -9,10 +9,10 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>private</modifier> <methodname>Yaf_Session::__construct</methodname>
    <void />
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
 
   </para>
diff --git a/reference/yaf/yaf_view_simple/construct.xml b/reference/yaf/yaf_view_simple/construct.xml
index 504ea5ad4e..34a1473315 100644
--- a/reference/yaf/yaf_view_simple/construct.xml
+++ b/reference/yaf/yaf_view_simple/construct.xml
@@ -9,11 +9,11 @@
 
  <refsect1 role="description">
   &reftitle.description;
-  <methodsynopsis>
+  <constructorsynopsis>
    <modifier>final</modifier> <modifier>public</modifier> <methodname>Yaf_View_Simple::__construct</methodname>
    <methodparam><type>string</type><parameter>template_dir</parameter></methodparam>
    <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
+  </constructorsynopsis>
   <para>
 
   </para>